From 4066a07d8fec401dfcf275d6a4683ff72344133d Mon Sep 17 00:00:00 2001 From: Patric Stout Date: Sat, 21 Aug 2021 11:56:29 +0200 Subject: [PATCH] Fix: [Network] crash when last-joined server that is no longer available (#9503) If you update the server-list while not having last-joined selected and it is no longer available, the game crashed. --- src/network/network_gui.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/network/network_gui.cpp b/src/network/network_gui.cpp index df2314cd79..6dd6c9c11f 100644 --- a/src/network/network_gui.cpp +++ b/src/network/network_gui.cpp @@ -249,15 +249,21 @@ protected: this->servers.clear(); bool found_current_server = false; + bool found_last_joined = false; for (NetworkGameList *ngl = _network_game_list; ngl != nullptr; ngl = ngl->next) { this->servers.push_back(ngl); if (ngl == this->server) { found_current_server = true; } + if (ngl == this->last_joined) { + found_last_joined = true; + } } /* A refresh can cause the current server to be delete; so unselect. */ + if (!found_last_joined) { + this->last_joined = nullptr; + } if (!found_current_server) { - if (this->server == this->last_joined) this->last_joined = nullptr; this->server = nullptr; this->list_pos = SLP_INVALID; }