From 3a5be2e8aff1c1bdd6406904307a7b3b7a062d38 Mon Sep 17 00:00:00 2001 From: Wolf Bergenheim Date: Wed, 21 Apr 2010 16:03:03 +0300 Subject: Fixed destructor --- libresourceqt/src/resource-engine.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'libresourceqt/src/resource-engine.cpp') diff --git a/libresourceqt/src/resource-engine.cpp b/libresourceqt/src/resource-engine.cpp index 929db17..93df853 100644 --- a/libresourceqt/src/resource-engine.cpp +++ b/libresourceqt/src/resource-engine.cpp @@ -4,6 +4,7 @@ using namespace ResourcePolicy; resconn_t *ResourceEngine::libresourceConnection = NULL; +quint32 ResourceEngine::libresourceUsers = 0; static inline quint32 allResourcesToBitmask(const ResourceSet *resourceSet); static inline quint32 optionalResourcesToBitmask(const ResourceSet *resourceSet); @@ -29,8 +30,10 @@ ResourceEngine::ResourceEngine(ResourceSet *resourceSet) ResourceEngine::~ResourceEngine() { - if (libresourceSet != NULL) + libresourceUsers--; + if (libresourceUsers == 0) { libresourceSet->userdata = NULL; + } //need to destroy all libresource structures, but how? } @@ -56,10 +59,14 @@ bool ResourceEngine::initialize() if (ResourceEngine::libresourceConnection == NULL) { return NULL; } + ResourceEngine::libresourceUsers = 1; resproto_set_handler(ResourceEngine::libresourceConnection, RESMSG_UNREGISTER, handleUnregisterMessage); resproto_set_handler(ResourceEngine::libresourceConnection, RESMSG_GRANT, handleGrantMessage); resproto_set_handler(ResourceEngine::libresourceConnection, RESMSG_ADVICE, handleAdviceMessage); } + else { + ResourceEngine::libresourceUsers += 1; + } qDebug("ResourceEngine (%p) is now initialized.", this); return true; -- cgit v1.2.3