diff options
| author | oldmud0 <oldmud0@users.noreply.github.com> | 2020-05-02 21:44:34 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-02 21:44:34 -0500 |
| commit | e9940c82bd10a2e82379bbe4da49262254b3df9a (patch) | |
| tree | 9e6fa756e088d1de99942090f9e4a2b5b84c2e9c | |
| parent | bbdad2a40d8f02fe738830d9cf66ad4ec2fa86cf (diff) | |
Fix syntax error from unclean merge
| -rw-r--r-- | src/path_functions.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/path_functions.cpp b/src/path_functions.cpp index bd41b068..358f146b 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"); |