From d4cce391f9836996667067771e4ce9ca64d3fb3c Mon Sep 17 00:00:00 2001
From: Wolf Bergenheim <ext-wolf.2.bergenheim@nokia.com>
Date: Wed, 7 Apr 2010 14:42:07 +0300
Subject: fixed bug #161198

---
 libresourceqt/src/resource-engine.cpp | 3 ++-
 libresourceqt/src/resource-set.cpp    | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'libresourceqt')

diff --git a/libresourceqt/src/resource-engine.cpp b/libresourceqt/src/resource-engine.cpp
index 014d2cc..402c0bf 100644
--- a/libresourceqt/src/resource-engine.cpp
+++ b/libresourceqt/src/resource-engine.cpp
@@ -177,7 +177,8 @@ bool ResourceEngine::connectToManager()
     qDebug("ResourceEngine is now connecting...");
     libresourceSet = resconn_connect(libresourceConnection, &resourceMessage,
                                      statusCallbackHandler);
-
+    if (libresourceSet == NULL)
+        return NULL;
     libresourceSet->userdata = this; //save our context
     return true;
 }
diff --git a/libresourceqt/src/resource-set.cpp b/libresourceqt/src/resource-set.cpp
index af0a6fc..b7a302b 100644
--- a/libresourceqt/src/resource-set.cpp
+++ b/libresourceqt/src/resource-set.cpp
@@ -58,6 +58,8 @@ void ResourceSet::addResourceObject(Resource *resource)
 {
     if(resource == NULL)
         return;
+    delete resourceSet[resource->type()];
+    resourceSet[resource->type()] = resource;
     if (resource->type() == AudioPlaybackType) {
         audioResource = static_cast<AudioResource *>(resource);
         QObject::connect(audioResource,
@@ -73,8 +75,6 @@ void ResourceSet::addResourceObject(Resource *resource)
             registerAudioProperties();
         }
     }
-    delete resourceSet[resource->type()];
-    resourceSet[resource->type()] = resource;
 }
 
 bool ResourceSet::addResource(ResourceType type)
-- 
cgit v1.2.3