From 6a341946a510fbb52d9df4df260bd7abf6887038 Mon Sep 17 00:00:00 2001
From: upstream svn <svn@amule.org>
Date: Sat, 2 May 2009 19:07:14 +0200
Subject: [PATCH] Upstream tarball 9584

---
 .svn-revision            | 2 +-
 src/amule-remote-gui.cpp | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.svn-revision b/.svn-revision
index d86b194c..c776c3cd 100644
--- a/.svn-revision
+++ b/.svn-revision
@@ -1 +1 @@
-9583
+9584
diff --git a/src/amule-remote-gui.cpp b/src/amule-remote-gui.cpp
index 8e2dbd69..5bad4f9d 100644
--- a/src/amule-remote-gui.cpp
+++ b/src/amule-remote-gui.cpp
@@ -319,9 +319,11 @@ void CamuleRemoteGuiApp::OnECConnection(wxEvent& event) {
 		glob_prefs->LoadRemote();
 	} else {
 		AddLogLineNS(_("Going down"));
-		wxMessageBox(
+		if (dialog) {	// can otherwise crash here on disconnect
+			wxMessageBox(
 			(CFormat(_("Connection Failed. Unable to connect to %s:%d\n")) % dialog->Host() % dialog->Port()) + reply,
 			_("ERROR"), wxOK);
+		}
 		ExitMainLoop();
 	}
 }
-- 
2.11.4.GIT