More audio fixes

gerstrong · Feb 9, 2018 · 2bba26a · 2bba26a
1 parent 39543a5
commit 2bba26a
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/src/sdl/audio/music/CMusic.cpp b/src/sdl/audio/music/CMusic.cpp
@@ -39,6 +39,8 @@ bool CMusic::loadTrack(const int track)
 bool CMusic::load(const std::string &musicfile)
 {        
 
+    Mix_HaltMusic();
+
         if(mpMixMusic)
         {
             Mix_FreeMusic(mpMixMusic);
@@ -242,8 +244,12 @@ bool CMusic::LoadfromMusicTable(const std::string &gamepath,
             if( load(filename) )
             {
                 play();
+                return true;
+            }
+            else
+            {
+                return false;
             }
-            return true;
         }
         Tablefile.ignore(std::numeric_limits<std::streamsize>::max(), '\n');
     }