scratchfoundation/scratch-vm
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-vm.git synced 2024-12-23 14:32:59 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix merge issue in execute.js

Browse source
This commit is contained in:
Tim Mickel 2016-06-30 19:01:19 -04:00
parent 1eaed6fff3
commit bb5acd1ef4
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/engine/execute.js
View file

@ -13,7 +13,7 @@ var execute = function (sequencer, thread) {
var currentBlockId = thread.peekStack(); var currentBlockId = thread.peekStack();
var currentStackFrame = thread.peekStackFrame(); var currentStackFrame = thread.peekStackFrame();
var opcode = runtime.blocks.getOpcode(currentBlockId); var opcode = target.blocks.getOpcode(currentBlockId);
if (!opcode) { if (!opcode) {
console.warn('Could not get opcode for block: ' + currentBlockId); console.warn('Could not get opcode for block: ' + currentBlockId);