From e0c96c6e3d57bbc7f9f56e9f61ab8c3ca8f1aefd Mon Sep 17 00:00:00 2001
From: Lorn Potter <lorn.potter@jollamobile.com>
Date: Thu, 25 Jul 2013 11:17:11 +1000
Subject: [PATCH] [connectionagent] fix crash when connmand restarts and bump
 version to 0.7.14

---
 connd/qconnectionmanager.cpp | 2 ++
 rpm/connectionagent-qt5.spec | 6 +++---
 rpm/connectionagent-qt5.yaml | 2 +-
 rpm/connectionagent.spec     | 2 +-
 rpm/connectionagent.yaml     | 2 +-
 5 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/connd/qconnectionmanager.cpp b/connd/qconnectionmanager.cpp
index e303c14..6901044 100644
--- a/connd/qconnectionmanager.cpp
+++ b/connd/qconnectionmanager.cpp
@@ -463,6 +463,8 @@ void QConnectionManager::connectionHandover(const QString &oldService, const QSt
 
     bool isOnline = false;
     bool ok = true;
+    if (!oldService.isEmpty() || newService.isEmpty())
+        return;
 
     if (servicesMap.value(oldService)->state() == "online"
             || servicesMap.value(oldService)->state() == "ready") {
diff --git a/rpm/connectionagent-qt5.spec b/rpm/connectionagent-qt5.spec
index da3aa5f..a4300d9 100644
--- a/rpm/connectionagent-qt5.spec
+++ b/rpm/connectionagent-qt5.spec
@@ -1,6 +1,6 @@
 # 
 # Do NOT Edit the Auto-generated Part!
-# Generated by: spectacle version 0.26
+# Generated by: spectacle version 0.27
 # 
 
 Name:       connectionagent-qt5
@@ -9,7 +9,7 @@ Name:       connectionagent-qt5
 # << macros
 
 Summary:    User Agent daemon
-Version:    0.7.13
+Version:    0.7.14
 Release:    0
 Group:      Communications/Connectivity Adaptation
 License:    LGPLv2
@@ -72,7 +72,7 @@ make %{?jobs:-j%jobs}
 rm -rf %{buildroot}
 # >> install pre
 # << install pre
-%qmake_install
+%qmake5_install
 
 # >> install post
 mkdir -p %{buildroot}%{_libdir}/systemd/user/user-session.target.wants
diff --git a/rpm/connectionagent-qt5.yaml b/rpm/connectionagent-qt5.yaml
index d7a100e..346e062 100644
--- a/rpm/connectionagent-qt5.yaml
+++ b/rpm/connectionagent-qt5.yaml
@@ -1,6 +1,6 @@
 Name: connectionagent-qt5
 Summary: User Agent daemon
-Version: 0.7.13
+Version: 0.7.14
 Release: 0
 Group: "Communications/Connectivity Adaptation"
 License: LGPLv2
diff --git a/rpm/connectionagent.spec b/rpm/connectionagent.spec
index 2ef3de9..e82c20d 100644
--- a/rpm/connectionagent.spec
+++ b/rpm/connectionagent.spec
@@ -9,7 +9,7 @@ Name:       connectionagent
 # << macros
 
 Summary:    User Agent daemon
-Version:    0.7.13
+Version:    0.7.14
 Release:    0
 Group:      Communications/Connectivity Adaptation
 License:    LGPLv2
diff --git a/rpm/connectionagent.yaml b/rpm/connectionagent.yaml
index f463949..8eb0e48 100644
--- a/rpm/connectionagent.yaml
+++ b/rpm/connectionagent.yaml
@@ -1,6 +1,6 @@
 Name: connectionagent
 Summary: User Agent daemon
-Version: 0.7.13
+Version: 0.7.14
 Release: 0
 Group: "Communications/Connectivity Adaptation"
 License: LGPLv2