# HG changeset patch # User rubidium # Date 2012-03-25 19:46:59 # Node ID 8f0b5a1acb1c3dae28cf7788e75c31d463214c02 # Parent 600844d541d0e08347aba92393db6a014c6e52f5 (svn r24070) -Fix [FS#5098]: the 'last joined' server was not properly selected anymore (adf88) diff --git a/src/network/network_gamelist.cpp b/src/network/network_gamelist.cpp --- a/src/network/network_gamelist.cpp +++ b/src/network/network_gamelist.cpp @@ -62,7 +62,7 @@ static void NetworkGameListHandleDelayed } item->manually |= ins_item->manually; if (item->manually) NetworkRebuildHostList(); - UpdateNetworkGameWindow(false); + UpdateNetworkGameWindow(); } free(ins_item); } @@ -105,7 +105,7 @@ NetworkGameList *NetworkGameListAddItem( } DEBUG(net, 4, "[gamelist] added server to list"); - UpdateNetworkGameWindow(false); + UpdateNetworkGameWindow(); return item; } @@ -132,7 +132,7 @@ void NetworkGameListRemoveItem(NetworkGa DEBUG(net, 4, "[gamelist] removed server from list"); NetworkRebuildHostList(); - UpdateNetworkGameWindow(false); + UpdateNetworkGameWindow(); return; } prev_item = item; diff --git a/src/network/network_gui.cpp b/src/network/network_gui.cpp --- a/src/network/network_gui.cpp +++ b/src/network/network_gui.cpp @@ -72,9 +72,9 @@ void SortNetworkLanguages() * found on the network. * @param unselect unselect the currently selected item */ -void UpdateNetworkGameWindow(bool unselect) +void UpdateNetworkGameWindow() { - InvalidateWindowData(WC_NETWORK_WINDOW, WN_NETWORK_WINDOW_GAME, unselect ? 1 : 0); + InvalidateWindowData(WC_NETWORK_WINDOW, WN_NETWORK_WINDOW_GAME, 0); } typedef GUIList GUIGameServerList; @@ -438,6 +438,9 @@ protected: public: NetworkGameWindow(const WindowDesc *desc) : QueryStringBaseWindow(NETWORK_CLIENT_NAME_LENGTH) { + this->list_pos = SLP_INVALID; + this->server = NULL; + this->CreateNestedTree(desc); this->vscroll = this->GetScrollbar(WID_NG_SCROLLBAR); this->FinishInitNested(desc, WN_NETWORK_WINDOW_GAME); @@ -447,8 +450,6 @@ public: InitializeTextBuffer(&this->text, this->edit_str_buf, this->edit_str_size, 120); this->SetFocusedWidget(WID_NG_CLIENT); - UpdateNetworkGameWindow(true); - this->field = WID_NG_CLIENT; this->last_joined = NetworkGameListAddItem(NetworkAddress(_settings_client.network.last_host, _settings_client.network.last_port)); this->server = this->last_joined; @@ -791,10 +792,6 @@ public: */ virtual void OnInvalidateData(int data = 0, bool gui_scope = true) { - if (data == 1) { - this->server = NULL; - this->list_pos = SLP_INVALID; - } this->servers.ForceRebuild(); this->SetDirty(); } diff --git a/src/network/network_internal.h b/src/network/network_internal.h --- a/src/network/network_internal.h +++ b/src/network/network_internal.h @@ -145,7 +145,7 @@ void NetworkTCPQueryServer(NetworkAddres void GetBindAddresses(NetworkAddressList *addresses, uint16 port); void NetworkAddServer(const char *b); void NetworkRebuildHostList(); -void UpdateNetworkGameWindow(bool unselect); +void UpdateNetworkGameWindow(); bool IsNetworkCompatibleVersion(const char *version); diff --git a/src/network/network_udp.cpp b/src/network/network_udp.cpp --- a/src/network/network_udp.cpp +++ b/src/network/network_udp.cpp @@ -395,7 +395,7 @@ void ClientNetworkUDPSocketHandler::Rece item->online = true; - UpdateNetworkGameWindow(false); + UpdateNetworkGameWindow(); } void ClientNetworkUDPSocketHandler::Receive_MASTER_RESPONSE_LIST(Packet *p, NetworkAddress *client_addr)