From 612f4b830f92432baeeed1710c78ed6044225b32 Mon Sep 17 00:00:00 2001
From: minjaesong <alswo9628@gmail.com>
Date: Sun, 21 Jan 2024 19:40:11 +0900
Subject: [PATCH] track stop condition via muting

---
 src/net/torvald/terrarum/audio/AudioMixer.kt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/net/torvald/terrarum/audio/AudioMixer.kt b/src/net/torvald/terrarum/audio/AudioMixer.kt
index 1b17d56a8..a56a5d6b4 100644
--- a/src/net/torvald/terrarum/audio/AudioMixer.kt
+++ b/src/net/torvald/terrarum/audio/AudioMixer.kt
@@ -363,16 +363,16 @@ class AudioMixer(val bufferSize: Int): Disposable {
                     req.fadeoutFired = false
                     track.volume = req.fadeTarget
 
-                    // stop streaming if fadeBus is muted
+                    // stop streaming if the track or the fader track is muted
                     if (req.fadeTarget == 0.0 && (track == musicTrack || track == fadeBus)) {
                         musicTrack.stop()
                         musicTrack.currentTrack = null
                     }
-                    if (req.fadeTarget == 0.0 && track == ambientTrack1) {
+                    if (req.fadeTarget == 0.0 && (track == ambientTrack1 || track == fadeBus)) {
                         ambientTrack1.stop()
                         ambientTrack1.currentTrack = null
                     }
-                    if (req.fadeTarget == 0.0 && track == ambientTrack2) {
+                    if (req.fadeTarget == 0.0 && (track == ambientTrack2 || track == fadeBus)) {
                         ambientTrack2.stop()
                         ambientTrack2.currentTrack = null
                     }