summaryrefslogtreecommitdiff
path: root/src/resources/resourcemanager.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-04-14 11:27:04 +0300
committerAndrei Karas <akaras@inbox.ru>2013-04-14 12:34:23 +0300
commita7d7346b9eb3fa62a8912e31d5c00f8e05390425 (patch)
treeba2d006e8aaac74138eb13ba458d30abf8f01182 /src/resources/resourcemanager.cpp
parent9569f124d176b4220f28f9a41812c33883737228 (diff)
downloadmv-a7d7346b9eb3fa62a8912e31d5c00f8e05390425.tar.gz
mv-a7d7346b9eb3fa62a8912e31d5c00f8e05390425.tar.bz2
mv-a7d7346b9eb3fa62a8912e31d5c00f8e05390425.tar.xz
mv-a7d7346b9eb3fa62a8912e31d5c00f8e05390425.zip
some more style fixes from cpplint.
Diffstat (limited to 'src/resources/resourcemanager.cpp')
-rw-r--r--src/resources/resourcemanager.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/resources/resourcemanager.cpp b/src/resources/resourcemanager.cpp
index 0cff31f0a..481f74d30 100644
--- a/src/resources/resourcemanager.cpp
+++ b/src/resources/resourcemanager.cpp
@@ -244,8 +244,8 @@ bool ResourceManager::cleanOrphans(const bool always)
const ResourceIterator toErase = iter;
++iter;
mOrphanedResources.erase(toErase);
- delete res; // delete only after removal from list,
- // to avoid issues in recursion
+ delete res; // delete only after removal from list,
+ // to avoid issues in recursion
status = true;
}
}
@@ -912,7 +912,8 @@ void ResourceManager::deleteInstance()
{
logger->log("clean orphans start");
instance->cleanProtected();
- while (instance->cleanOrphans(true));
+ while (instance->cleanOrphans(true))
+ continue;
logger->log("clean orphans end");
ResourceIterator iter = instance->mResources.begin();