mirror of
https://github.com/scratchfoundation/scratch-vm.git
synced 2025-01-24 16:40:11 -05:00
Clear out the blocks in dispose. Fixes #1758 where old monitored variables were getting kept across project loads
This commit is contained in:
parent
4fe06153d6
commit
cddcea652b
3 changed files with 44 additions and 0 deletions
|
@ -1547,6 +1547,7 @@ class Runtime extends EventEmitter {
|
||||||
dispose () {
|
dispose () {
|
||||||
this.stopAll();
|
this.stopAll();
|
||||||
this.targets.map(this.disposeTarget, this);
|
this.targets.map(this.disposeTarget, this);
|
||||||
|
this.monitorBlocks = new Blocks(true);
|
||||||
this._monitorState = OrderedMap({});
|
this._monitorState = OrderedMap({});
|
||||||
// @todo clear out extensions? turboMode? etc.
|
// @todo clear out extensions? turboMode? etc.
|
||||||
|
|
||||||
|
|
BIN
test/fixtures/monitored_variables.sb3
vendored
Normal file
BIN
test/fixtures/monitored_variables.sb3
vendored
Normal file
Binary file not shown.
43
test/integration/variable_monitor_reset.js
Normal file
43
test/integration/variable_monitor_reset.js
Normal file
|
@ -0,0 +1,43 @@
|
||||||
|
const path = require('path');
|
||||||
|
const test = require('tap').test;
|
||||||
|
const makeTestStorage = require('../fixtures/make-test-storage');
|
||||||
|
const readFileToBuffer = require('../fixtures/readProjectFile').readFileToBuffer;
|
||||||
|
const VirtualMachine = require('../../src/index');
|
||||||
|
|
||||||
|
const projectUri = path.resolve(__dirname, '../fixtures/monitored_variables.sb3');
|
||||||
|
const project = readFileToBuffer(projectUri);
|
||||||
|
|
||||||
|
const anotherProjectUri = path.resolve(__dirname, '../fixtures/default.sb2');
|
||||||
|
const anotherProject = readFileToBuffer(anotherProjectUri);
|
||||||
|
|
||||||
|
test('importing one project after the other resets monitored variables', t => {
|
||||||
|
const vm = new VirtualMachine();
|
||||||
|
vm.attachStorage(makeTestStorage());
|
||||||
|
|
||||||
|
// Start VM, load project, and run
|
||||||
|
vm.start();
|
||||||
|
vm.clear();
|
||||||
|
vm.setCompatibilityMode(false);
|
||||||
|
vm.setTurboMode(false);
|
||||||
|
vm.loadProject(project).then(() => {
|
||||||
|
|
||||||
|
const refSprite = vm.runtime.targets[1];
|
||||||
|
const refVarId = Object.keys(refSprite.variables)[0];
|
||||||
|
const refBlock = vm.runtime.monitorBlocks.getBlock(refVarId);
|
||||||
|
t.ok(refBlock);
|
||||||
|
const jamalSprite = vm.runtime.targets[2];
|
||||||
|
const jamalVarId = Object.keys(jamalSprite.variables)[0];
|
||||||
|
const jamalBlock = vm.runtime.monitorBlocks.getBlock(jamalVarId);
|
||||||
|
t.ok(jamalBlock);
|
||||||
|
vm.loadProject(anotherProject).then(() => {
|
||||||
|
// Blocks from the previously loaded project should be gone.
|
||||||
|
const refVarBlock = vm.runtime.monitorBlocks.getBlock(refVarId);
|
||||||
|
t.notOk(refVarBlock);
|
||||||
|
const jamalVarBlock = vm.runtime.monitorBlocks.getBlock(jamalVarId);
|
||||||
|
t.notOk(jamalVarBlock);
|
||||||
|
|
||||||
|
t.end();
|
||||||
|
process.nextTick(process.exit);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
Loading…
Reference in a new issue