From dc19141997a7a3c2e596b40775264b8389065dbe Mon Sep 17 00:00:00 2001
From: Joern <joern.rm@gmail.com>
Date: Sat, 19 Sep 2015 17:13:21 +0200
Subject: [PATCH] Fix Error in Device Pairing for ANT+ devices in TrainMode ...
 after making Wheelsize Settings athlete dependent

---
 src/ANTlocalController.cpp | 9 ++++++++-
 src/Settings.cpp           | 2 ++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/ANTlocalController.cpp b/src/ANTlocalController.cpp
index 628086b73..6ab1eccfc 100644
--- a/src/ANTlocalController.cpp
+++ b/src/ANTlocalController.cpp
@@ -25,7 +25,14 @@
 
 ANTlocalController::ANTlocalController(TrainSidebar *parent, DeviceConfiguration *dc) : RealtimeController(parent, dc)
 {
-    myANTlocal = new ANT (parent, dc, parent->context->athlete->cyclist);
+    // for Device Pairing the controller is called with parent = NULL
+    QString cyclist;
+    if (parent) {
+        cyclist = parent->context->athlete->cyclist;
+    } else {
+        cyclist = QString();
+    }
+    myANTlocal = new ANT (parent, dc, cyclist);
     connect(myANTlocal, SIGNAL(foundDevice(int,int,int)), this, SIGNAL(foundDevice(int,int,int)));
     connect(myANTlocal, SIGNAL(lostDevice(int)), this, SIGNAL(lostDevice(int)));
     connect(myANTlocal, SIGNAL(searchTimeout(int)), this, SIGNAL(searchTimeout(int)));
diff --git a/src/Settings.cpp b/src/Settings.cpp
index 930fcb26a..5301a5860 100644
--- a/src/Settings.cpp
+++ b/src/Settings.cpp
@@ -173,6 +173,8 @@ GSettings::setValue(QString key, QVariant value)
 QVariant
 GSettings::cvalue(QString athleteName, QString key, QVariant def) {
 
+    if (athleteName.isNull() || athleteName.isEmpty()) return def;
+
     QString keyVar = QString(key);
     if (newFormat) {
         int store;