From 125bacfeb960ccb01ffe8ae4421be85c94d3cd82 Mon Sep 17 00:00:00 2001
From: minjaesong <alswo9628@gmail.com>
Date: Thu, 9 Nov 2023 16:29:22 +0900
Subject: [PATCH] fix: stop-callback from disposed musicgovernor killing the
 newly queued music

---
 .../torvald/terrarum/modulebasegame/TerrarumMusicGovernor.kt   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/net/torvald/terrarum/modulebasegame/TerrarumMusicGovernor.kt b/src/net/torvald/terrarum/modulebasegame/TerrarumMusicGovernor.kt
index 421966a01..6cb4e235d 100644
--- a/src/net/torvald/terrarum/modulebasegame/TerrarumMusicGovernor.kt
+++ b/src/net/torvald/terrarum/modulebasegame/TerrarumMusicGovernor.kt
@@ -58,7 +58,7 @@ class TerrarumMusicGovernor : MusicGovernor() {
 
 
     private fun stopMusic() {
-        AudioManager.stopMusic()
+//        AudioManager.stopMusic() // music will stop itself; with this line not commented, the stop-callback from the already disposed musicgovernor will stop the music queued by the new musicgovernor instance
         state = STATE_INTERMISSION
         intermissionAkku = 0f
         intermissionLength = 30f + 30f * Math.random().toFloat() // 30s-60s
@@ -117,6 +117,7 @@ class TerrarumMusicGovernor : MusicGovernor() {
     }
 
     override fun dispose() {
+        AudioManager.stopMusic() // explicit call for fade-out when the game instance quits
         stopMusic()
     }
 }