aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCrystalwarrior <Varsash@Gmail.com>2021-01-18 17:39:13 +0300
committerGitHub <noreply@github.com>2021-01-18 15:39:13 +0100
commit5786694b53a28210cef9b2ea751e9b69f86af548 (patch)
tree3225240217dd56f7ecc0ea1284433fc8dff98b99
parentc42496e20479edd72ab57860967aed8592bd383b (diff)
Stack default soundlist after the character soundlist instead of making the character soundlist overwrite the default (#411)
-rw-r--r--src/courtroom.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/courtroom.cpp b/src/courtroom.cpp
index ed256c0a..b478eedf 100644
--- a/src/courtroom.cpp
+++ b/src/courtroom.cpp
@@ -4324,13 +4324,13 @@ void Courtroom::set_sfx_dropdown()
ui_sfx_remove->hide();
return;
}
+ // Initialzie character sound list first. Will be empty if not found.
sound_list = ao_app->get_list_file(
ao_app->get_character_path(current_char, "soundlist.ini"));
- if (sound_list.size() <= 0) {
- sound_list = ao_app->get_list_file(
- ao_app->get_base_path() + "soundlist.ini");
- }
+ // Append default sound list after the character sound list.
+ sound_list += ao_app->get_list_file(
+ ao_app->get_base_path() + "soundlist.ini");
QStringList display_sounds;
for (QString sound : sound_list) {