diff options
| -rw-r--r-- | src/path_functions.cpp | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/src/path_functions.cpp b/src/path_functions.cpp index c2c15a26..72b7accc 100644 --- a/src/path_functions.cpp +++ b/src/path_functions.cpp @@ -96,22 +96,31 @@ QString AOApplication::get_sounds_path(QString p_file) QString AOApplication::get_music_path(QString p_song) { + QString withending_check = get_base_path() + "sounds/music/" + p_song; QString mp3_check = get_base_path() + "sounds/music/" + p_song + ".mp3"; QString opus_check = get_base_path() + "sounds/music/" + p_song + ".opus"; if (file_exists(opus_check)) { #ifndef CASE_SENSITIVE_FILESYSTEM - return get_base_path() + "sounds/music/" + p_song + ".opus"; + return opus_check; #else - return get_case_sensitive_path(get_base_path() + "sounds/music/" + p_song + ".opus"); + return get_case_sensitive_path(opus_check); #endif } else if (file_exists(mp3_check)) { #ifndef CASE_SENSITIVE_FILESYSTEM - return get_base_path() + "sounds/music/" + p_song + ".mp3"; + return mp3_check; #else - return get_case_sensitive_path(get_base_path() + "sounds/music/" + p_song + ".mp3"); + return get_case_sensitive_path(mp3_check); + #endif + } + else if (file_exists(withending_check)) + { + #ifndef CASE_SENSITIVE_FILESYSTEM + return withending_check; + #else + return get_case_sensitive_path(withending_check); #endif } #ifndef CASE_SENSITIVE_FILESYSTEM |