From b5e49b7f19bb7ed3aaa8de57a3fd4a21dcf907a0 Mon Sep 17 00:00:00 2001
From: Struma <strumajen@icloud.com>
Date: Fri, 19 May 2023 06:27:16 -0400
Subject: [PATCH] spray two leftover audio bugs + BGM doesn't fading back in
 after playing an ME + `Audio#bgm_play` should stop() every track EXCEPT the
 first one when 	called with no track argument

---
 src/audio/audio.cpp | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/audio/audio.cpp b/src/audio/audio.cpp
index 6e421828..d4a17509 100644
--- a/src/audio/audio.cpp
+++ b/src/audio/audio.cpp
@@ -213,10 +213,10 @@ struct AudioPrivate
                             
                             if (!track->noResumeStop)
                                 track->stream.play();
+                            
+                            meWatch.state = MeNotPlaying;
                         }
                         
-                        meWatch.state = MeNotPlaying;
-                        
                         track->unlockStream();
                     }
 				}
@@ -296,8 +296,12 @@ void Audio::bgmPlay(const char *filename,
                     int track)
 {
     if (track == -127) {
-        for (auto track : p->bgmTracks)
-            track->stop();
+        for (int i = 0; i < (int)p->bgmTracks.size(); i++) {
+            if (i == 0) {
+                continue;
+            }
+            p->bgmTracks[i]->stop();
+        }
         
         track = 0;
     }