scratchfoundation/scratch-vm
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-vm.git synced 2025-01-08 14:01:58 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

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

Browse source 
Prevent "broadcast and wait" being interrupted by a change to its input
This commit is contained in:
Eric Rosenbaum 2020-09-16 17:52:28 -04:00 committed by GitHub
commit 9329f93e74
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/blocks/scratch3_event.js
View file

@ -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.

BIN
test/fixtures/execute/broadcast-wait-arg-change.sb2 vendored Normal file
View file

Binary file not shown.