diff options
author | rubidium <rubidium@openttd.org> | 2012-03-25 19:46:59 +0000 |
---|---|---|
committer | rubidium <rubidium@openttd.org> | 2012-03-25 19:46:59 +0000 |
commit | 1adb9a5c85f3773d3163b056ad0ed13a97347276 (patch) | |
tree | dd34a278938866534a033dc33a3c6f1926ce5c2b /src/network/network_gui.cpp | |
parent | f2f939906e78010ccf23e0d6a250d12a3a74a7af (diff) | |
download | openttd-1adb9a5c85f3773d3163b056ad0ed13a97347276.tar.xz |
(svn r24070) -Fix [FS#5098]: the 'last joined' server was not properly selected anymore (adf88)
Diffstat (limited to 'src/network/network_gui.cpp')
-rw-r--r-- | src/network/network_gui.cpp | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/network/network_gui.cpp b/src/network/network_gui.cpp index acda5dab1..151776d74 100644 --- 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<NetworkGameList*> 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(); } |