From e9940c82bd10a2e82379bbe4da49262254b3df9a Mon Sep 17 00:00:00 2001 From: oldmud0 Date: Sat, 2 May 2020 21:44:34 -0500 Subject: [PATCH] Fix syntax error from unclean merge --- src/path_functions.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/path_functions.cpp b/src/path_functions.cpp index bd41b06..358f146 100644 --- a/src/path_functions.cpp +++ b/src/path_functions.cpp @@ -100,7 +100,7 @@ QString AOApplication::get_music_path(QString p_song) //it's an URL return p_song; } - else if (file_exists(opus_check)) + else if (file_exists(opus_check)) { #ifndef CASE_SENSITIVE_FILESYSTEM return opus_check; #else @@ -123,7 +123,6 @@ QString AOApplication::get_music_path(QString p_song) } #ifndef CASE_SENSITIVE_FILESYSTEM return get_base_path() + "sounds/music/" + p_song + ".wav"; - ; #else return get_case_sensitive_path(get_base_path() + "sounds/music/" + p_song + ".wav");