From 74f6813a55f0f9183ad6a6740028fd3f1b58d647 Mon Sep 17 00:00:00 2001 From: planetmaker Date: Fri, 7 Oct 2011 08:17:47 +0000 Subject: [PATCH] (svn r23011) -Fix [FS#4791]: When the last used server is deleted from the list also clear the last used server if it is the same (monoid) --- src/network/network_gui.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/network/network_gui.cpp b/src/network/network_gui.cpp index 781110261c..de8fadae15 100644 --- a/src/network/network_gui.cpp +++ b/src/network/network_gui.cpp @@ -716,9 +716,8 @@ public: } case NGWW_LASTJOINED: { - NetworkGameList *last_joined = NetworkGameListAddItem(NetworkAddress(_settings_client.network.last_host, _settings_client.network.last_port)); - if (last_joined != NULL) { - this->server = last_joined; + if (this->last_joined != NULL) { + this->server = this->last_joined; /* search the position of the newly selected server */ for (uint i = 0; i < this->servers.Length(); i++) { @@ -861,6 +860,7 @@ public: if (this->server != NULL) { if (keycode == WKC_DELETE) { // Press 'delete' to remove servers NetworkGameListRemoveItem(this->server); + if (this->server == this->last_joined) this->last_joined = NULL; this->server = NULL; this->list_pos = SLP_INVALID; }