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

Fix segfault in server list without a server selection (#374)

Browse Source 
Also bumps C++ version to C++17 (C++1z).
This commit is contained in:
Skye Deving 2021-01-09 11:59:51 -06:00 committed by GitHub
parent 883fa8547d
commit 05dd086fff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Attorney_Online.pro
View File

@ -35,7 +35,7 @@ LIBS += -lbassopus
macx:LIBS += -framework CoreFoundation -framework Foundation -framework CoreServices macx:LIBS += -framework CoreFoundation -framework Foundation -framework CoreServices
CONFIG += c++14 CONFIG += c++17
RESOURCES += resources.qrc RESOURCES += resources.qrc

17
src/lobby.cpp
View File

@ -283,7 +283,10 @@ QString Lobby::get_chatlog()
int Lobby::get_selected_server() int Lobby::get_selected_server()
{ {
return ui_server_list->currentItem()->text(0).toInt(); if (auto item = ui_server_list->currentItem()) {
return item->text(0).toInt();
}
return -1;
} }
void Lobby::set_loading_value(int p_value) void Lobby::set_loading_value(int p_value)
@ -333,12 +336,12 @@ void Lobby::on_add_to_fav_pressed()
void Lobby::on_add_to_fav_released() void Lobby::on_add_to_fav_released()
{ {
ui_add_to_fav->set_image("addtofav"); ui_add_to_fav->set_image("addtofav");
if (public_servers_selected) {
// you cant add favorites from favorites m8 int selection = get_selected_server();
if (!public_servers_selected) if (selection > -1) {
return; ao_app->add_favorite_server(selection);
}
ao_app->add_favorite_server(get_selected_server()); }
} }
void Lobby::on_connect_pressed() { ui_connect->set_image("connect_pressed"); } void Lobby::on_connect_pressed() { ui_connect->set_image("connect_pressed"); }