From 3f3ba5f3e18b0a5093e7275aee574ecd6f293ec6 Mon Sep 17 00:00:00 2001
From: David Athay <ko2fan@gmail.com>
Date: Thu, 3 Apr 2008 12:53:00 +0000
Subject: Tweaked disconnect dialog to fix crash bug id=250

---
 ChangeLog    | 4 ++++
 src/game.cpp | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b9db8343..da2fde63 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-04-03  David Athay  <ko2fan@gmail.com>
+
+	* src/game.cpp: Tweaked disconnect dialog, hoping to fix a crash bug.
+
 2008-03-30  Dennis Friis  <peavey@placid.dk>
 
 	* configure.ac: Updated for tmwdata split.
diff --git a/src/game.cpp b/src/game.cpp
index 553f80c3..0d8cfa6c 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -140,6 +140,7 @@ namespace {
                 done = true;
             }
             exitConfirm = NULL;
+            disconnectedDialog = NULL;
         }
     } exitListener;
 }
@@ -428,9 +429,8 @@ void Game::logic()
                     OkDialog("Network Error",
                     "The connection to the server was lost, the program will now quit");
                 disconnectedDialog->addActionListener(&exitListener);
+                disconnectedDialog->requestMoveToTop();
             }
-
-            disconnectedDialog->requestMoveToTop();
         }
     }
 }
-- 
cgit v1.2.3-70-g09d2