diff options
Diffstat (limited to 'src/resources')
| -rw-r--r-- | src/resources/resource.h | 6 | ||||
| -rw-r--r-- | src/resources/resourcemanager.cpp | 15 |
2 files changed, 14 insertions, 7 deletions
diff --git a/src/resources/resource.h b/src/resources/resource.h index ce3a62fb..fe534606 100644 --- a/src/resources/resource.h +++ b/src/resources/resource.h @@ -53,6 +53,12 @@ class Resource bool decRef(); + /** + * Return the path identifying this resource. + */ + const std::string& + getIdPath() { return mIdPath; } + protected: /** * Destructor. diff --git a/src/resources/resourcemanager.cpp b/src/resources/resourcemanager.cpp index c941e16e..4a8a010a 100644 --- a/src/resources/resourcemanager.cpp +++ b/src/resources/resourcemanager.cpp @@ -31,6 +31,7 @@ #include "soundeffect.h" #include "../log.h" +#include "../gui/button.h" ResourceManager *ResourceManager::instance = NULL; @@ -43,23 +44,23 @@ ResourceManager::~ResourceManager() { // Create our resource iterator. std::map<std::string, Resource*>::iterator iter = resources.begin(); - int danglingResources = 0; - int danglingReferences = 0; // Iterate through and release references until objects are deleted. while (!resources.empty()) { Resource *res = resources.begin()->second; - danglingResources++; + std::string id = res->getIdPath(); + + int references = 0; do { - danglingReferences++; + references++; } while (!res->decRef()); - } - logger->log("ResourceManager::~ResourceManager() cleaned up %d references " - "to %d resources", danglingReferences, danglingResources); + logger->log("ResourceManager::~ResourceManager() cleaned up %d " + "references to %s", references, id.c_str()); + } } bool |