mirror of
https://github.com/libretro/scummvm.git
synced 2024-12-28 04:34:50 +00:00
Merge pull request #689 from Tkachov/master
SWORD25: Fix "Resource not released" warnings
This commit is contained in:
commit
fe7332cb18
@ -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
|
||||
}
|
||||
|
||||
|
@ -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;
|
||||
|
@ -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();
|
||||
|
Loading…
Reference in New Issue
Block a user