Mamanyonyo/atrooney-online-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix lobby force-switching you from Favorites list if you switched from the Serverlist before it was populated (#826)

Browse Source
This commit is contained in:
Crystalwarrior 2022-07-29 18:40:02 +03:00 committed by GitHub
parent da5437ab6f
commit 834c5ff929
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/lobby.cpp
View File

@ -303,9 +303,9 @@ void Lobby::on_public_servers_clicked()
reset_selection(); reset_selection();
list_servers();
public_servers_selected = true; public_servers_selected = true;
list_servers();
} }
void Lobby::on_favorites_clicked() void Lobby::on_favorites_clicked()
@ -317,9 +317,9 @@ void Lobby::on_favorites_clicked()
ao_app->set_favorite_list(); ao_app->set_favorite_list();
list_favorites();
public_servers_selected = false; public_servers_selected = false;
list_favorites();
} }
void Lobby::reset_selection() void Lobby::reset_selection()
@ -502,7 +502,9 @@ void Lobby::on_server_search_edited(QString p_text)
void Lobby::list_servers() void Lobby::list_servers()
{ {
public_servers_selected = true; if (!public_servers_selected) {
return;
}
ui_favorites->set_image("favorites"); ui_favorites->set_image("favorites");
ui_public_servers->set_image("publicservers_selected"); ui_public_servers->set_image("publicservers_selected");
@ -524,6 +526,9 @@ void Lobby::list_servers()
void Lobby::list_favorites() void Lobby::list_favorites()
{ {
if (public_servers_selected) {
return;
}
ui_server_list->setSortingEnabled(false); ui_server_list->setSortingEnabled(false);
ui_server_list->clear(); ui_server_list->clear();