From 0ae009eb21eb2f079379320edb34fd2deb0d3a2a Mon Sep 17 00:00:00 2001
From: scrawl <720642+scrawl@users.noreply.github.com>
Date: Wed, 27 Sep 2017 22:18:47 +0200
Subject: [PATCH] Hide message box before deleting it

Fixes a crash when closing the game window during the 'plugin mismatch' dialog. Modal windows have to be hidden before they are deleted to prevent a dangling pointer in WindowManager.
---
 apps/openmw/mwgui/messagebox.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwgui/messagebox.cpp b/apps/openmw/mwgui/messagebox.cpp
index dd0495051..6c421de5e 100644
--- a/apps/openmw/mwgui/messagebox.cpp
+++ b/apps/openmw/mwgui/messagebox.cpp
@@ -36,8 +36,13 @@ namespace MWGui
 
     void MessageBoxManager::clear()
     {
-        delete mInterMessageBoxe;
-        mInterMessageBoxe = NULL;
+        if (mInterMessageBoxe)
+        {
+            mInterMessageBoxe->setVisible(false);
+
+            delete mInterMessageBoxe;
+            mInterMessageBoxe = NULL;
+        }
 
         std::vector<MessageBox*>::iterator it(mMessageBoxes.begin());
         for (; it != mMessageBoxes.end(); ++it)