Handle MyGUI exceptions inside destructors

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"
 
@@ -48,9 +50,16 @@ KeyboardNavigation::KeyboardNavigation()
 }
 
 KeyboardNavigation::~KeyboardNavigation()
+{
+    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)
 {

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);
 

apps/openmw/mwgui/screenfader.cpp

@@ -98,9 +98,16 @@ namespace MWGui
     }
 
     ScreenFader::~ScreenFader()
+    {
+        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)
     {

apps/openmw/mwgui/windowmanagerimp.cpp

@@ -517,6 +517,8 @@ namespace MWGui
     }
 
     WindowManager::~WindowManager()
+    {
+        try
         {
             mKeyboardNavigation.reset();
 
@@ -548,6 +550,11 @@ namespace MWGui
             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)
     {

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)
+        {
+            try
+            {
                 MyGUI::ResourceManager::getInstance().removeByName((*it)->getResourceName());
+            }
+            catch(const MyGUI::Exception& e)
+            {
+                Log(Debug::Error) << "Error in the destructor: " << e.what();
+            }
+        }
+
         mFonts.clear();
     }