Merge pull request #6 from wlsnmrk/double-music-fix-no-editor-settings

fix: prevent doubled music
chickensoft-games · Dec 29, 2023 · 288ded9 · 288ded9
2 parents f52efbe + 93b2d97
commit 288ded9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/src/in_game_audio/InGameAudio.cs b/src/in_game_audio/InGameAudio.cs
@@ -72,11 +72,13 @@ public void OnExitTree() {
 
   public void StartMainMenuMusic() {
     GameMusic.FadeOut();
+    MainMenuMusic.Stop();
     MainMenuMusic.FadeIn();
   }
 
   public void StartGameMusic() {
     MainMenuMusic.FadeOut();
+    GameMusic.Stop();
     GameMusic.FadeIn();
   }
 }
diff --git a/test/src/in_game_audio/InGameAudioTest.cs b/test/src/in_game_audio/InGameAudioTest.cs
@@ -70,6 +70,7 @@ public void OnExitTree() {
   public void PlaysMainMenuMusic() {
     _logic.Setup(logic => logic.Start());
     _gameMusic.Setup(music => music.FadeOut());
+    _mainMenuMusic.Setup(music => music.Stop());
     _mainMenuMusic.Setup(music => music.FadeIn());
 
     _audio.OnResolved();
@@ -84,6 +85,7 @@ public void PlaysMainMenuMusic() {
   [Test]
   public void PlaysGameMusic() {
     _logic.Setup(logic => logic.Start());
+    _gameMusic.Setup(music => music.Stop());
     _gameMusic.Setup(music => music.FadeIn());
     _mainMenuMusic.Setup(music => music.FadeOut());