Merge pull request #689 from Tkachov/master

SWORD25: Fix "Resource not released" warnings
This commit is contained in:
Eugene Sandulenko 2016-03-06 01:37:03 +01:00
commit fe7332cb18
3 changed files with 8 additions and 5 deletions

View File

@ -211,8 +211,9 @@ bool AnimationResource::precacheAllFrames() const {
error("Could not precache \"%s\".", (*iter).fileName.c_str());
return false;
}
#else
Kernel::getInstance()->getResourceManager()->requestResource((*iter).fileName);
#else
Resource *pResource = Kernel::getInstance()->getResourceManager()->requestResource((*iter).fileName);
pResource->release(); //unlock precached resource
#endif
}

View File

@ -103,8 +103,9 @@ bool FontResource::parserCallback_font(ParserNode *node) {
if (!_pKernel->getResourceManager()->precacheResource(_bitmapFileName)) {
error("Could not precache \"%s\".", _bitmapFileName.c_str());
}
#else
_pKernel->getResourceManager()->requestResource(_bitmapFileName);
#else
Resource *pResource = _pKernel->getResourceManager()->requestResource(_bitmapFileName);
pResource->release(); //unlock precached resource
#endif
return true;

View File

@ -77,7 +77,8 @@ bool Text::setFont(const Common::String &font) {
return false;
}
#else
getResourceManager()->requestResource(font);
Resource *pResource = getResourceManager()->requestResource(font);
pResource->release(); //unlock precached resource
_font = font;
updateFormat();
forceRefresh();