diff options
| -rw-r--r-- | include/courtroom.h | 3 | ||||
| -rw-r--r-- | include/lobby.h | 2 | ||||
| -rw-r--r-- | src/aoapplication.cpp | 1 | ||||
| -rw-r--r-- | src/courtroom.cpp | 10 | ||||
| -rw-r--r-- | src/packet_distribution.cpp | 8 |
5 files changed, 17 insertions, 7 deletions
diff --git a/include/courtroom.h b/include/courtroom.h index 9da465ab..e8145140 100644 --- a/include/courtroom.h +++ b/include/courtroom.h @@ -588,6 +588,9 @@ private: QString current_background = "default"; QString current_side = ""; + QString last_music_search = ""; + QString last_area_search = ""; + QBrush free_brush; QBrush lfp_brush; QBrush casing_brush; diff --git a/include/lobby.h b/include/lobby.h index 0f066ab4..0f1610f9 100644 --- a/include/lobby.h +++ b/include/lobby.h @@ -84,7 +84,7 @@ private: QProgressBar *ui_progress_bar; AOButton *ui_cancel; - int last_index; + int last_index = -1; void set_size_and_pos(QWidget *p_widget, QString p_identifier); diff --git a/src/aoapplication.cpp b/src/aoapplication.cpp index 1ae90f8c..74857593 100644 --- a/src/aoapplication.cpp +++ b/src/aoapplication.cpp @@ -27,6 +27,7 @@ AOApplication::~AOApplication() destruct_lobby(); destruct_courtroom(); delete discord; + delete configini; } void AOApplication::construct_lobby() diff --git a/src/courtroom.cpp b/src/courtroom.cpp index d12ede56..18c6f01e 100644 --- a/src/courtroom.cpp +++ b/src/courtroom.cpp @@ -4349,6 +4349,7 @@ void Courtroom::on_music_search_edited(QString p_text) (*it)->setHidden(p_text != ""); ++it; } + last_music_search = p_text; } if (!ui_area_list->isHidden()) { @@ -4357,6 +4358,7 @@ void Courtroom::on_music_search_edited(QString p_text) (*ait)->setHidden(p_text != ""); ++ait; } + last_area_search = p_text; } if (p_text != "") { @@ -5469,16 +5471,20 @@ void Courtroom::on_evidence_button_clicked() void Courtroom::on_switch_area_music_clicked() { - ui_music_search->setText(""); - on_music_search_edited(ui_music_search->text()); if (ui_area_list->isHidden()) { ui_area_list->show(); ui_music_list->hide(); + last_music_search = ui_music_search->text(); + ui_music_search->setText(last_area_search); } else { ui_area_list->hide(); ui_music_list->show(); + last_area_search = ui_music_search->text(); + ui_music_search->setText(last_music_search); } + on_music_search_edited(ui_music_search->text()); + } void Courtroom::ping_server() diff --git a/src/packet_distribution.cpp b/src/packet_distribution.cpp index dfe28f40..bcbc6671 100644 --- a/src/packet_distribution.cpp +++ b/src/packet_distribution.cpp @@ -405,10 +405,6 @@ void AOApplication::server_packet_received(AOPacket *p_packet) } } - for (int area_n = 0; area_n < areas; area_n++) { - w_courtroom->arup_append(0, "Unknown", "Unknown", "Unknown"); - } - int total_loading_size = char_list_size * 2 + evidence_list_size + music_list_size; int loading_value = int( @@ -418,6 +414,10 @@ void AOApplication::server_packet_received(AOPacket *p_packet) w_lobby->set_loading_value(loading_value); } + for (int area_n = 0; area_n < areas; area_n++) { + w_courtroom->arup_append(0, "Unknown", "Unknown", "Unknown"); + } + send_server_packet(new AOPacket("RD#%")); } else if (header == "FM") // Fetch music ONLY |