Merge branch 'master' into music_list_update

1 files changed, 29 insertions, 3 deletions

diff --git a/src/path_functions.cpp b/src/path_functions.cpp
index 5eb97a3..72b7acc 100644
--- a/src/path_functions.cpp
+++ b/src/path_functions.cpp
@@ -96,11 +96,37 @@ QString AOApplication::get_sounds_path(QString p_file)
 
 QString AOApplication::get_music_path(QString p_song)
 {
-  QString path = get_base_path() + "sounds/music/" + 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 opus_check;
+    #else
+      return get_case_sensitive_path(opus_check);
+    #endif
+  }
+  else if (file_exists(mp3_check))
+  {
+    #ifndef CASE_SENSITIVE_FILESYSTEM
+      return mp3_check;
+    #else
+      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
-  return path;
+  return get_base_path() + "sounds/music/" + p_song + ".wav";
 #else
-  return get_case_sensitive_path(path);
+  return get_case_sensitive_path(get_base_path() + "sounds/music/" + p_song + ".wav");
 #endif
 }