1 files changed, 9 insertions, 0 deletions
diff --git a/src/client.cpp b/src/client.cpp
index e281ddced..3a2a5f493 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -777,6 +777,9 @@ void Client::gameClear()
     if (logger)
         logger->log1("Quitting2");
 
+    delete mCurrentDialog;
+    mCurrentDialog = nullptr;
+
     delete gui;
     gui = nullptr;
 
@@ -2873,3 +2876,9 @@ void Client::logEvent(const SDL_Event &event)
             break;
     };
 }
+
+void Client::windowRemoved(const Window *const window)
+{
+    if (instance()->mCurrentDialog == window)
+        instance()->mCurrentDialog = nullptr;
+}