From 5786694b53a28210cef9b2ea751e9b69f86af548 Mon Sep 17 00:00:00 2001 From: Crystalwarrior Date: Mon, 18 Jan 2021 17:39:13 +0300 Subject: [PATCH] Stack default soundlist after the character soundlist instead of making the character soundlist overwrite the default (#411) --- src/courtroom.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/courtroom.cpp b/src/courtroom.cpp index ed256c0..b478eed 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) {