Merge branch 'master' into meego

1 files changed, 21 insertions, 7 deletions

diff --git a/libresourceqt/src/resource-set.cpp b/libresourceqt/src/resource-set.cpp
index 8b46664..190df5e 100644
--- a/libresourceqt/src/resource-set.cpp
+++ b/libresourceqt/src/resource-set.cpp
@@ -80,6 +80,8 @@ bool ResourceSet::initialize()
                      this, SLOT(handleResourcesBecameAvailable(quint32)));
     QObject::connect(resourceEngine, SIGNAL(errorCallback(quint32, const char*)),
                      this, SIGNAL(errorCallback(quint32, const char*)));
+    QObject::connect(resourceEngine, SIGNAL(resourcesReleasedByManager()),
+                     this, SIGNAL(resourcesReleasedByManager()));
 
     qDebug("initializing resource engine...");
     if (!resourceEngine->initialize()) {
@@ -228,21 +230,32 @@ Resource * ResourceSet::resource(ResourceType type) const
     return resourceSet[type];
 }
 
-bool ResourceSet::acquire()
+bool ResourceSet::initAndConnect()
 {
-    if (!initialized) {
+    if ( !initialized ) {
         qDebug("ResourceSet::%s().... initializing...", __FUNCTION__);
-        pendingAcquire = true;
         return initialize();
     }
 
-    if (!resourceEngine->isConnectedToManager()) {
+    if ( !resourceEngine->isConnectedToManager() ) {
         qDebug("ResourceSet::%s().... connecting...", __FUNCTION__);
+        return resourceEngine->connectToManager();
+    }
+    else
+        qDebug("ResourceSet::%s(): already connected", __FUNCTION__);
+
+    return true;
+}
+
+bool ResourceSet::acquire()
+{
+    if ( !initialized || !resourceEngine->isConnectedToManager() )
+    {
         pendingAcquire = true;
-        resourceEngine->connectToManager();
-        return true;
+        return initAndConnect();
     }
-    else {
+    else
+    {
         qDebug("ResourceSet::%s().... acquiring", __FUNCTION__);
         return resourceEngine->acquireResources();
     }
@@ -309,6 +322,7 @@ void ResourceSet::connectedHandler()
     qDebug("**************** ResourceSet::%s().... %d", __FUNCTION__, __LINE__);
     if (resourceEngine->isConnectedToManager()) {
         qDebug("ResourceSet::%s() Connected to manager!", __FUNCTION__);
+        emit connectedToManager();
 
         if (pendingAudioProperties) {
             registerAudioProperties();