Fix music changes between areas

TerryCavanagh · Apr 10, 2022 · c364e55 · c364e55
1 parent b855310
commit c364e55
Showing 1 changed file with 11 additions and 2 deletions.
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;
         }
     }
 
@@ -406,6 +414,7 @@ class MusicTrack
     bool shouldloop;
     bool valid;
 
+    static bool paused;
     static FAudioSourceVoice* musicVoice;
 
     static void refillReserve(FAudioVoiceCallback* callback, void* ctx)
@@ -560,7 +569,7 @@ class MusicTrack
         return (result * 60 + val) * samplerate_hz;
     }
 };
-
+bool MusicTrack::paused = false;
 FAudioSourceVoice* MusicTrack::musicVoice = NULL;
 
 musicclass::musicclass(void)
@@ -1130,7 +1139,7 @@ void musicclass::resumeef(void)
 
 bool musicclass::halted(void)
 {
-    return MusicTrack::IsHalted();
+    return MusicTrack::IsPaused();
 }
 
 void musicclass::updatemutestate(void)