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

Merge pull request #319 from AttorneyOnline/in1tiate/music-missingno

Browse Source 
Indicate when a song was not found to reduce confusion
This commit is contained in:
oldmud0 2020-10-31 18:26:10 -05:00 committed by GitHub
commit e0e2898393
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/courtroom.cpp
View File

@ -1533,9 +1533,8 @@ void Courtroom::on_chat_return_pressed()
return; return;
ui_ic_chat_message->blockSignals(true); ui_ic_chat_message->blockSignals(true);
QTimer::singleShot(600, this, [=] { QTimer::singleShot(600, this,
ui_ic_chat_message->blockSignals(false); [=] { ui_ic_chat_message->blockSignals(false); });
});
// MS# // MS#
// deskmod# // deskmod#
// pre-emote# // pre-emote#
@ -3159,8 +3158,12 @@ void Courtroom::handle_song(QStringList *p_contents)
} }
music_player->play(f_song, channel, looping, effect_flags); music_player->play(f_song, channel, looping, effect_flags);
if (channel == 0) if (channel == 0) {
ui_music_name->setText(f_song_clear); if (file_exists(ao_app->get_sfx_suffix(ao_app->get_music_path(f_song))))
ui_music_name->setText(f_song_clear);
else
ui_music_name->setText(tr("[MISSING] %1").arg(f_song_clear));
}
} }
else { else {
QString str_char = char_list.at(n_char).name; QString str_char = char_list.at(n_char).name;
@ -3191,8 +3194,12 @@ void Courtroom::handle_song(QStringList *p_contents)
append_ic_text(f_song_clear, str_show, tr("has played a song")); append_ic_text(f_song_clear, str_show, tr("has played a song"));
music_player->play(f_song, channel, looping, effect_flags); music_player->play(f_song, channel, looping, effect_flags);
if (channel == 0) if (channel == 0) {
ui_music_name->setText(f_song_clear); if (file_exists(ao_app->get_sfx_suffix(ao_app->get_music_path(f_song))))
ui_music_name->setText(f_song_clear);
else
ui_music_name->setText(tr("[MISSING] %1").arg(f_song_clear));
}
} }
} }
} }