scratchfoundation/scratch-vm
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-vm.git synced 2024-12-24 06:52:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix procedure name lookup to work with undefined procedures.

Browse source
This commit is contained in:
Paul Kaplan 2017-12-13 15:37:58 -05:00
parent a586c5d9cd
commit 0fe7eca018
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/blocks/scratch3_procedures.js
View file

@ -27,15 +27,17 @@ class Scratch3ProcedureBlocks {
call (args, util) { call (args, util) {
if (!util.stackFrame.executed) { if (!util.stackFrame.executed) {
const procedureCode = args.mutation.proccode; const procedureCode = args.mutation.proccode;
const [paramNames, paramIds] = util.getProcedureParamNamesAndIds(procedureCode); const paramNamesAndIds = util.getProcedureParamNamesAndIds(procedureCode);
// If null, procedure could not be found, which can happen if custom // If null, procedure could not be found, which can happen if custom
// block is dragged between sprites without the definition. // block is dragged between sprites without the definition.
// Match Scratch 2.0 behavior and noop. // Match Scratch 2.0 behavior and noop.
if (paramNames === null) { if (paramNamesAndIds === null) {
return; return;
} }
const [paramNames, paramIds] = paramNamesAndIds;
for (let i = 0; i < paramIds.length; i++) { for (let i = 0; i < paramIds.length; i++) {
if (args.hasOwnProperty(paramIds[i])) { if (args.hasOwnProperty(paramIds[i])) {
util.pushParam(paramNames[i], args[paramIds[i]]); util.pushParam(paramNames[i], args[paramIds[i]]);