Skip to content

fix(vm): missing check for thread status after executing hats and typo of stackFrames in retireThread #687

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
alexcui03 wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

fix(vm): missing check for thread status after executing hats and typo of stackFrames in retireThread #687

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f0fc968
fix(vm): thread status check after executing hats
alexcui03 Aug 26, 2026
8fcddc1
fix(vm): typo of thread.stackFrames in retireThread
alexcui03 Aug 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions packages/scratch-vm/src/engine/runtime.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1926,6 +1926,10 @@ class Runtime extends EventEmitter {
// threads are stepped. See ScratchRuntime.as for original implementation
newThreads.forEach(thread => {
execute(this.sequencer, thread);
if (thread.status === Thread.STATUS_DONE) {
// Thread might be done after `execute`.
return;
}
thread.goToNextBlock();
});
return newThreads;
Expand Down
2 changes: 1 addition & 1 deletion packages/scratch-vm/src/engine/sequencer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,7 @@ class Sequencer {
*/
retireThread (thread) {
thread.stack = [];
thread.stackFrame = [];
thread.stackFrames = [];
thread.requestScriptGlowInFrame = false;
thread.status = Thread.STATUS_DONE;
}
Expand Down
2 changes: 1 addition & 1 deletion packages/scratch-vm/src/engine/thread.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ class Thread {
/**
* Reset the stack frame for use by the next block.
* (avoids popping and re-pushing a new stack frame - keeps the warpmode the same
* @param {string} blockId Block ID to push to stack.
* @param {string | null} blockId Block ID to push to stack.
*/
reuseStackForNextBlock (blockId) {
this.stack[this.stack.length - 1] = blockId;
Expand Down
Loading