From a41c216a692fa0a99b04f4172e5283865e8e1e29 Mon Sep 17 00:00:00 2001
From: upstream svn <svn@amule.org>
Date: Sun, 28 Jun 2009 08:05:10 +0200
Subject: [PATCH] Upstream tarball 9689

---
 .svn-revision            | 2 +-
 docs/Changelog           | 1 +
 src/amule-remote-gui.cpp | 5 ++++-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.svn-revision b/.svn-revision
index 19069fc6..46a1e075 100644
--- a/.svn-revision
+++ b/.svn-revision
@@ -1 +1 @@
-9688
+9689
diff --git a/docs/Changelog b/docs/Changelog
index caf63617..a895e98e 100644
--- a/docs/Changelog
+++ b/docs/Changelog
@@ -80,6 +80,7 @@ Version 2.3.0 - The river knows.
 		* Don't kick friend upload, don't kick release prio uploads (unless they take more
 		  than half of the slots), and don't kick anybody else unless necessary (with GonoszTopi)
 		* Fixed HTTP download if server transmits no content-length
+		* Fixed crash in remote gui when aMule exits
 
 	Vollstrecker:
 		* Unify copyright lines
diff --git a/src/amule-remote-gui.cpp b/src/amule-remote-gui.cpp
index 905d963e..584934f2 100644
--- a/src/amule-remote-gui.cpp
+++ b/src/amule-remote-gui.cpp
@@ -319,10 +319,12 @@ void CamuleRemoteGuiApp::OnECConnection(wxEvent& event) {
 		glob_prefs->LoadRemote();
 	} else {
 		AddLogLineNS(_("Going down"));
-		if (dialog) {	// can otherwise crash here on disconnect
+		if (dialog) {	// connect failed
 			wxMessageBox(
 			(CFormat(_("Connection Failed. Unable to connect to %s:%d\n")) % dialog->Host() % dialog->Port()) + reply,
 			_("ERROR"), wxOK);
+		} else {		// server disconnected (probably terminated) later
+			wxMessageBox(_("Connection closed - aMule has terminated probably."), _("ERROR"), wxOK);
 		}
 		ExitMainLoop();
 	}
@@ -349,6 +351,7 @@ void CamuleRemoteGuiApp::Startup() {
 		wxConfig::Get()->Write(wxT("/EC/Password"), dialog->PassHash());
 	}
 	dialog->Destroy();
+	dialog = NULL;
 	
 	m_ConnState = 0;
 	m_clientID  = 0;
-- 
2.11.4.GIT