From 431231ccb8b24b74e45a787e39da335641a76f8a Mon Sep 17 00:00:00 2001
From: Vsevolod Buzinov <ext-vsevolod.buzinov@nokia.com>
Date: Fri, 16 Jul 2010 14:09:35 +0300
Subject: Added null-check for disconnectFromManager() to fix bug 177254

---
 libresourceqt/src/resource-engine.cpp | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/libresourceqt/src/resource-engine.cpp b/libresourceqt/src/resource-engine.cpp
index 7687b8f..7efcb6e 100644
--- a/libresourceqt/src/resource-engine.cpp
+++ b/libresourceqt/src/resource-engine.cpp
@@ -275,12 +275,11 @@ bool ResourceEngine::disconnectFromManager()
 
 //    messageMap.insert(requestId, RESMSG_UNREGISTER);
 
-    int r = resconn_disconnect(libresourceSet, &resourceMessage,
-                               statusCallbackHandler);
-    if (r)
-        return true;
-    else
-        return false;
+    bool ret = true;
+    if (libresourceSet != NULL) {
+      r = resconn_disconnect(libresourceSet, &resourceMessage, statusCallbackHandler) != 0;
+    }
+    return ret;
 }
 
 bool ResourceEngine::toBeDeleted()
-- 
cgit v1.2.3