Mirrorlandia_minetest/minetest
1
0
Fork 1
mirror of https://github.com/minetest/minetest.git synced 2024-11-23 16:13:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Android: Fix memory leak when displaying images in the mainmenu (#8011)

Browse Source
This commit is contained in:
rubenwardy 2018-12-22 07:46:41 +00:00 committed by Loïc Blot
parent a318bceb63
commit 0990ddb3bb
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/gui/guiEngine.cpp
View File

@ -70,22 +70,30 @@ MenuTextureSource::~MenuTextureSource()
/******************************************************************************/ /******************************************************************************/
video::ITexture *MenuTextureSource::getTexture(const std::string &name, u32 *id) video::ITexture *MenuTextureSource::getTexture(const std::string &name, u32 *id)
{ {
if(id) if (id)
*id = 0; *id = 0;
if(name.empty())
if (name.empty())
return NULL; return NULL;
m_to_delete.insert(name); m_to_delete.insert(name);
#ifdef __ANDROID__ #ifdef __ANDROID__
video::IImage *image = m_driver->createImageFromFile(name.c_str()); video::ITexture *retval = m_driver->findTexture(name.c_str());
if (image) { if (retval)
image = Align2Npot2(image, m_driver);
video::ITexture* retval = m_driver->addTexture(name.c_str(), image);
image->drop();
return retval; return retval;
}
#endif video::IImage *image = m_driver->createImageFromFile(name.c_str());
if (!image)
return NULL;
image = Align2Npot2(image, m_driver);
retval = m_driver->addTexture(name.c_str(), image);
image->drop();
return retval;
#else
return m_driver->getTexture(name.c_str()); return m_driver->getTexture(name.c_str());
#endif
} }
/******************************************************************************/ /******************************************************************************/