1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-03-29 20:06:43 +00:00

Merge branch 'fix-mem-leak-2' into 'master'

Clean-up FontLoader::loadFontFromXml fix

See merge request OpenMW/openmw!561
This commit is contained in:
AnyOldName3 2021-01-23 18:44:38 +00:00
commit 0d2cdd5b7b

View file

@ -593,7 +593,7 @@ namespace Gui
if (createCopy) if (createCopy)
{ {
MyGUI::xml::ElementPtr copy = _node->createCopy(); std::unique_ptr<MyGUI::xml::Element> copy{_node->createCopy()};
MyGUI::xml::ElementEnumerator copyFont = copy->getElementEnumerator(); MyGUI::xml::ElementEnumerator copyFont = copy->getElementEnumerator();
while (copyFont.next("Resource")) while (copyFont.next("Resource"))
@ -629,8 +629,7 @@ namespace Gui
} }
} }
MyGUI::ResourceManager::getInstance().loadFromXmlNode(copy, _file, _version); MyGUI::ResourceManager::getInstance().loadFromXmlNode(copy.get(), _file, _version);
delete copy;
} }
} }