From c2c24a76a4914af9c5a857368fcc64df6d486e68 Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Sun, 9 Sep 2018 16:06:25 +0400
Subject: [PATCH] Handle MyGUI exceptions inside destructors

---
 apps/openmw/mwgui/keyboardnavigation.cpp | 11 ++++-
 apps/openmw/mwgui/layout.hpp             | 14 ++++++-
 apps/openmw/mwgui/screenfader.cpp        |  9 ++++-
 apps/openmw/mwgui/windowmanagerimp.cpp   | 51 ++++++++++++++----------
 components/fontloader/fontloader.cpp     | 12 +++++-
 5 files changed, 71 insertions(+), 26 deletions(-)

diff --git a/apps/openmw/mwgui/keyboardnavigation.cpp b/apps/openmw/mwgui/keyboardnavigation.cpp
index cde8a17ccd..96970b39fe 100644
--- a/apps/openmw/mwgui/keyboardnavigation.cpp
+++ b/apps/openmw/mwgui/keyboardnavigation.cpp
@@ -6,6 +6,8 @@
 #include <MyGUI_Gui.h>
 #include <MyGUI_Window.h>
 
+#include <components/debug/debuglog.hpp>
+
 #include "../mwbase/windowmanager.hpp"
 #include "../mwbase/environment.hpp"
 
@@ -49,7 +51,14 @@ KeyboardNavigation::KeyboardNavigation()
 
 KeyboardNavigation::~KeyboardNavigation()
 {
-    MyGUI::WidgetManager::getInstance().unregisterUnlinker(this);
+    try
+    {
+        MyGUI::WidgetManager::getInstance().unregisterUnlinker(this);
+    }
+    catch(const MyGUI::Exception& e)
+    {
+        Log(Debug::Error) << "Error in the destructor: " << e.what();
+    }
 }
 
 void KeyboardNavigation::saveFocus(int mode)
diff --git a/apps/openmw/mwgui/layout.hpp b/apps/openmw/mwgui/layout.hpp
index 0e7cf3faa7..ea51bf541e 100644
--- a/apps/openmw/mwgui/layout.hpp
+++ b/apps/openmw/mwgui/layout.hpp
@@ -5,6 +5,8 @@
 #include <MyGUI_WidgetDefines.h>
 #include <MyGUI_Widget.h>
 
+#include <components/debug/debuglog.hpp>
+
 namespace MWGui
 {
   /** The Layout class is an utility class used to load MyGUI layouts
@@ -16,7 +18,17 @@ namespace MWGui
     Layout(const std::string & _layout, MyGUI::Widget* _parent = nullptr)
       : mMainWidget(nullptr)
     { initialise(_layout, _parent); }
-    virtual ~Layout() { shutdown();  }
+    virtual ~Layout()
+    {
+        try
+        {
+            shutdown();
+        }
+        catch(const MyGUI::Exception& e)
+        {
+            Log(Debug::Error) << "Error in the destructor: " << e.what();
+        }
+    }
 
     MyGUI::Widget* getWidget(const std::string& _name);
 
diff --git a/apps/openmw/mwgui/screenfader.cpp b/apps/openmw/mwgui/screenfader.cpp
index 9a9a1ae01a..e75e4954e4 100644
--- a/apps/openmw/mwgui/screenfader.cpp
+++ b/apps/openmw/mwgui/screenfader.cpp
@@ -99,7 +99,14 @@ namespace MWGui
 
     ScreenFader::~ScreenFader()
     {
-        MyGUI::Gui::getInstance().eventFrameStart -= MyGUI::newDelegate(this, &ScreenFader::onFrameStart);
+        try
+        {
+            MyGUI::Gui::getInstance().eventFrameStart -= MyGUI::newDelegate(this, &ScreenFader::onFrameStart);
+        }
+        catch(const MyGUI::Exception& e)
+        {
+            Log(Debug::Error) << "Error in the destructor: " << e.what();
+        }
     }
 
     void ScreenFader::onFrameStart(float dt)
diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp
index 45897b88cf..6917e2e8ad 100644
--- a/apps/openmw/mwgui/windowmanagerimp.cpp
+++ b/apps/openmw/mwgui/windowmanagerimp.cpp
@@ -518,35 +518,42 @@ namespace MWGui
 
     WindowManager::~WindowManager()
     {
-        mKeyboardNavigation.reset();
+        try
+        {
+            mKeyboardNavigation.reset();
 
-        MyGUI::LanguageManager::getInstance().eventRequestTag.clear();
-        MyGUI::PointerManager::getInstance().eventChangeMousePointer.clear();
-        MyGUI::InputManager::getInstance().eventChangeKeyFocus.clear();
-        MyGUI::ClipboardManager::getInstance().eventClipboardChanged.clear();
-        MyGUI::ClipboardManager::getInstance().eventClipboardRequested.clear();
+            MyGUI::LanguageManager::getInstance().eventRequestTag.clear();
+            MyGUI::PointerManager::getInstance().eventChangeMousePointer.clear();
+            MyGUI::InputManager::getInstance().eventChangeKeyFocus.clear();
+            MyGUI::ClipboardManager::getInstance().eventClipboardChanged.clear();
+            MyGUI::ClipboardManager::getInstance().eventClipboardRequested.clear();
 
-        for (WindowBase* window : mWindows)
-            delete window;
-        mWindows.clear();
+            for (WindowBase* window : mWindows)
+                delete window;
+            mWindows.clear();
 
-        delete mMessageBoxManager;
-        delete mLocalMapRender;
-        delete mCharGen;
-        delete mDragAndDrop;
-        delete mSoulgemDialog;
-        delete mCursorManager;
-        delete mToolTips;
+            delete mMessageBoxManager;
+            delete mLocalMapRender;
+            delete mCharGen;
+            delete mDragAndDrop;
+            delete mSoulgemDialog;
+            delete mCursorManager;
+            delete mToolTips;
 
-        cleanupGarbage();
+            cleanupGarbage();
 
-        mFontLoader.reset();
+            mFontLoader.reset();
 
-        mGui->shutdown();
-        delete mGui;
+            mGui->shutdown();
+            delete mGui;
 
-        mGuiPlatform->shutdown();
-        delete mGuiPlatform;
+            mGuiPlatform->shutdown();
+            delete mGuiPlatform;
+        }
+        catch(const MyGUI::Exception& e)
+        {
+            Log(Debug::Error) << "Error in the destructor: " << e.what();
+        }
     }
 
     void WindowManager::setStore(const MWWorld::ESMStore &store)
diff --git a/components/fontloader/fontloader.cpp b/components/fontloader/fontloader.cpp
index 790df7fa84..37214a038c 100644
--- a/components/fontloader/fontloader.cpp
+++ b/components/fontloader/fontloader.cpp
@@ -161,7 +161,17 @@ namespace Gui
         mTextures.clear();
 
         for (std::vector<MyGUI::ResourceManualFont*>::iterator it = mFonts.begin(); it != mFonts.end(); ++it)
-            MyGUI::ResourceManager::getInstance().removeByName((*it)->getResourceName());
+        {
+            try
+            {
+                MyGUI::ResourceManager::getInstance().removeByName((*it)->getResourceName());
+            }
+            catch(const MyGUI::Exception& e)
+            {
+                Log(Debug::Error) << "Error in the destructor: " << e.what();
+            }
+        }
+
         mFonts.clear();
     }