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

Fixed a bug where the music being played would depend on the row selected.

Browse Source
This commit is contained in:
Cerapter 2018-08-14 17:06:23 +02:00
parent f81a9adc99
commit 0f8cb919e2
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
courtroom.cpp
View File

@ -790,6 +790,7 @@ void Courtroom::enter_courtroom(int p_cid)
void Courtroom::list_music() void Courtroom::list_music()
{ {
ui_music_list->clear(); ui_music_list->clear();
music_row_to_number.clear();
QString f_file = "courtroom_design.ini"; QString f_file = "courtroom_design.ini";
@ -807,6 +808,7 @@ void Courtroom::list_music()
if (i_song.toLower().contains(ui_music_search->text().toLower())) if (i_song.toLower().contains(ui_music_search->text().toLower()))
{ {
ui_music_list->addItem(i_song_listname); ui_music_list->addItem(i_song_listname);
music_row_to_number.append(n_song);
QString song_path = ao_app->get_base_path() + "sounds/music/" + i_song.toLower(); QString song_path = ao_app->get_base_path() + "sounds/music/" + i_song.toLower();
@ -2404,8 +2406,7 @@ void Courtroom::on_music_list_double_clicked(QModelIndex p_model)
if (is_muted) if (is_muted)
return; return;
//QString p_song = ui_music_list->item(p_model.row())->text(); QString p_song = music_list.at(music_row_to_number.at(p_model.row()));
QString p_song = music_list.at(p_model.row());
if (!ui_ic_chat_name->text().isEmpty()) if (!ui_ic_chat_name->text().isEmpty())
{ {

2
courtroom.h
View File

@ -191,6 +191,8 @@ private:
QSignalMapper *char_button_mapper; QSignalMapper *char_button_mapper;
QVector<int> music_row_to_number;
//triggers ping_server() every 60 seconds //triggers ping_server() every 60 seconds
QTimer *keepalive_timer; QTimer *keepalive_timer;