Merge pull request #2557 from ericrosenbaum/broadcast-wait-var-change…

…-fix Prevent "broadcast and wait" being interrupted by a change to its input
scratchfoundation · Sep 16, 2020 · 9329f93 · 9329f93
2 parents 7c65224 + f103094
commit 9329f93
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/blocks/scratch3_event.js b/src/blocks/scratch3_event.js
@@ -90,10 +90,12 @@ class Scratch3EventBlocks {
     }
 
     broadcastAndWait (args, util) {
-        const broadcastVar = util.runtime.getTargetForStage().lookupBroadcastMsg(
-            args.BROADCAST_OPTION.id, args.BROADCAST_OPTION.name);
-        if (broadcastVar) {
-            const broadcastOption = broadcastVar.name;
+        if (!util.stackFrame.broadcastVar) {
+            util.stackFrame.broadcastVar = util.runtime.getTargetForStage().lookupBroadcastMsg(
+                args.BROADCAST_OPTION.id, args.BROADCAST_OPTION.name);
+        }
+        if (util.stackFrame.broadcastVar) {
+            const broadcastOption = util.stackFrame.broadcastVar.name;
             // Have we run before, starting threads?
             if (!util.stackFrame.startedThreads) {
                 // No - start hats for this broadcast.

diff --git a/test/fixtures/execute/broadcast-wait-arg-change.sb2 b/test/fixtures/execute/broadcast-wait-arg-change.sb2