Mirrors/phaser
2
0
Fork 0
mirror of https://github.com/photonstorm/phaser synced 2024-11-17 02:08:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #4593 from samme/fix/scene-create-remove

Browse source 
Fix an error when destroying a scene during create()
This commit is contained in:
Richard Davey 2019-06-17 19:47:14 +01:00 committed by GitHub
commit a884277e2f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/scene/SceneManager.js
View file

@ -610,6 +610,11 @@ var SceneManager = new Class({
settings.status = CONST.CREATING; settings.status = CONST.CREATING;
scene.create.call(scene, settings.data); scene.create.call(scene, settings.data);
if (settings.status === CONST.DESTROYED)
{
return;
}
} }
if (settings.isTransition) if (settings.isTransition)
@ -823,7 +828,7 @@ var SceneManager = new Class({
/** /**
* Returns an array of all the current Scenes being managed by this Scene Manager. * Returns an array of all the current Scenes being managed by this Scene Manager.
* *
* You can filter the output by the active state of the Scene and choose to have * You can filter the output by the active state of the Scene and choose to have
* the array returned in normal or reversed order. * the array returned in normal or reversed order.
* *
@ -1161,25 +1166,25 @@ var SceneManager = new Class({
scene.sys.start(data); scene.sys.start(data);
var loader; var loader;
if (scene.sys.load) if (scene.sys.load)
{ {
loader = scene.sys.load; loader = scene.sys.load;
} }
// Files payload? // Files payload?
if (loader && scene.sys.settings.hasOwnProperty('pack')) if (loader && scene.sys.settings.hasOwnProperty('pack'))
{ {
loader.reset(); loader.reset();
if (loader.addPack({ payload: scene.sys.settings.pack })) if (loader.addPack({ payload: scene.sys.settings.pack }))
{ {
scene.sys.settings.status = CONST.LOADING; scene.sys.settings.status = CONST.LOADING;
loader.once(LoaderEvents.COMPLETE, this.payloadComplete, this); loader.once(LoaderEvents.COMPLETE, this.payloadComplete, this);
loader.start(); loader.start();
return this; return this;
} }
} }