summaryrefslogtreecommitdiff
path: root/src/client.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-01-20 14:15:45 +0300
committerAndrei Karas <akaras@inbox.ru>2013-01-20 14:15:45 +0300
commitd07fba228b5251862ad670e1d4f079c9456fab4b (patch)
tree7c44b5e282bca638de29642b330d5f0a30a97b8b /src/client.cpp
parentcc7b5b170738c1c17437fdb6740f5af7824ca979 (diff)
downloadmv-d07fba228b5251862ad670e1d4f079c9456fab4b.tar.gz
mv-d07fba228b5251862ad670e1d4f079c9456fab4b.tar.bz2
mv-d07fba228b5251862ad670e1d4f079c9456fab4b.tar.xz
mv-d07fba228b5251862ad670e1d4f079c9456fab4b.zip
Fix crashes on closing client before entering game.
Diffstat (limited to 'src/client.cpp')
-rw-r--r--src/client.cpp9
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;
+}