Fix music changes between areas

TerryCavanagh · Apr 10, 2022 · 1cf298d · 1cf298d
1 parent b855310
commit 1cf298d
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/desktop_version/src/Music.cpp b/desktop_version/src/Music.cpp
@@ -357,6 +357,7 @@ class MusicTrack
             FAudioSourceVoice_FlushSourceBuffers(musicVoice);
             FAudioVoice_DestroyVoice(musicVoice);
             musicVoice = NULL;
+            paused = true;
         }
     }
 
@@ -370,14 +371,21 @@ class MusicTrack
         if (!IsHalted())
         {
             FAudioSourceVoice_Stop(musicVoice, 0, FAUDIO_COMMIT_NOW);
+            paused = true;
         }
     }
 
+    static bool IsPaused()
+    {
+        return paused || IsHalted();
+    }
+
     static void Resume()
     {
         if (!IsHalted())
         {
             FAudioSourceVoice_Start(musicVoice, 0, FAUDIO_COMMIT_NOW);
+            paused = false;
         }
     }
 
@@ -405,6 +413,7 @@ class MusicTrack
     Uint8* read_buf = NULL;
     bool shouldloop;
     bool valid;
+    bool paused;
 
     static FAudioSourceVoice* musicVoice;
 
@@ -1130,7 +1139,7 @@ void musicclass::resumeef(void)
 
 bool musicclass::halted(void)
 {
-    return MusicTrack::IsHalted();
+    return MusicTrack::IsPaused();
 }
 
 void musicclass::updatemutestate(void)