Better order of stop/connect/play

scratchfoundation · Jun 21, 2018 · 7089b76 · 7089b76
1 parent 65978d7
commit 7089b76
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/src/SoundBank.js b/src/SoundBank.js
@@ -90,11 +90,17 @@ class SoundBank {
         const effects = this.getSoundEffects(soundId);
         const player = this.getSoundPlayer(soundId);
 
+        if (this.playerTargets.get(soundId) !== target) {
+            // make sure to stop the old sound, effectively "forking" the output
+            // when the target switches before we adjust it's effects
+            player.stop();
+        }
+
         this.playerTargets.set(soundId, target);
-        effects.setEffectsFromTarget(target);
         effects.addSoundPlayer(player);
-
+        effects.setEffectsFromTarget(target);
         player.connect(effects);
+
         player.play();
 
         return player.finished();