diff options
author | Wolf Bergenheim <ext-wolf.2.bergenheim@nokia.com> | 2010-05-28 11:19:21 +0300 |
---|---|---|
committer | Wolf Bergenheim <ext-wolf.2.bergenheim@nokia.com> | 2010-05-28 11:19:21 +0300 |
commit | 5fcbe96c43a70deab3d0ec9af3ecec6c906d245d (patch) | |
tree | edd4f391cee01fab00d143d1b79f6abd8004a5eb /libresourceqt/src/resource-set.cpp | |
parent | dc9c29594133291a2944591a359c7adb8f24a85e (diff) |
Fixed bug in trying to register too many times when the first acquire is
called often.
Diffstat (limited to 'libresourceqt/src/resource-set.cpp')
-rw-r--r-- | libresourceqt/src/resource-set.cpp | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/libresourceqt/src/resource-set.cpp b/libresourceqt/src/resource-set.cpp index d39d445..7dfd5d7 100644 --- a/libresourceqt/src/resource-set.cpp +++ b/libresourceqt/src/resource-set.cpp @@ -193,19 +193,19 @@ Resource * ResourceSet::resource(ResourceType type) const bool ResourceSet::acquire() { if (!initialized) { - qDebug("**************** ResourceSet::%s().... %d", __FUNCTION__, __LINE__); + qDebug("ResourceSet::%s().... initializing...", __FUNCTION__); pendingAcquire = true; return initialize(); } if (!resourceEngine->isConnectedToManager()) { - qDebug("**************** ResourceSet::%s().... %d", __FUNCTION__, __LINE__); + qDebug("ResourceSet::%s().... connecting...", __FUNCTION__); pendingAcquire = true; resourceEngine->connectToManager(); return true; } else { - qDebug("**************** ResourceSet::%s().... %d", __FUNCTION__, __LINE__); + qDebug("ResourceSet::%s().... acquiring", __FUNCTION__); return resourceEngine->acquireResources(); } } @@ -216,6 +216,7 @@ bool ResourceSet::release() return true; } + qDebug("ResourceSet::%s().... releasing...", __FUNCTION__); return resourceEngine->releaseResources(); } @@ -227,8 +228,10 @@ bool ResourceSet::update() if (!resourceEngine->isConnectedToManager()) { pendingUpdate = true; + resourceEngine->connectToManager(); return true; } + qDebug("ResourceSet::%s().... updating...", __FUNCTION__); return resourceEngine->updateResources(); } @@ -267,6 +270,7 @@ void ResourceSet::connectedHandler() { qDebug("**************** ResourceSet::%s().... %d", __FUNCTION__, __LINE__); qDebug("Connected to manager!"); + if (pendingAudioProperties) { registerAudioProperties(); } @@ -287,8 +291,9 @@ void ResourceSet::registerAudioProperties() pendingAudioProperties = true; initialize(); } - else if (!resourceEngine->isConnectedToManager()) { + if (!resourceEngine->isConnectedToManager() && !resourceEngine->isConnectingToManager()) { qDebug("%s(): Connecting to Manager...", __FUNCTION__); + pendingAudioProperties = true; resourceEngine->connectToManager(); } |