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

Clean-up FontLoader::loadFontFromXml fix See merge request OpenMW/openmw!561
4 years ago · 0d2cdd5b7b
parent b28adafee4 1e113710ef
commit 0d2cdd5b7b
1 changed files with 2 additions and 3 deletions
--- a/components/fontloader/fontloader.cpp
+++ b/components/fontloader/fontloader.cpp
@ -593,7 +593,7 @@ namespace Gui

        if (createCopy)
        {
-            MyGUI::xml::ElementPtr copy = _node->createCopy();
+            std::unique_ptr<MyGUI::xml::Element> copy{_node->createCopy()};

            MyGUI::xml::ElementEnumerator copyFont = copy->getElementEnumerator();
            while (copyFont.next("Resource"))
@ -629,8 +629,7 @@ namespace Gui
                }
            }

-            MyGUI::ResourceManager::getInstance().loadFromXmlNode(copy, _file, _version);
-            delete copy;
+            MyGUI::ResourceManager::getInstance().loadFromXmlNode(copy.get(), _file, _version);
        }
    }