Exit finishedLoading() if game is destroyed

Fixes phaserjs#666 No signals are dispatched (API change)
dhashvir · May 12, 2020 · 9b76df4 · 9b76df4
1 parent bf5493e
commit 9b76df4
Showing 1 changed file with 3 additions and 9 deletions.
diff --git a/src/loader/Loader.js b/src/loader/Loader.js
@@ -2163,7 +2163,8 @@ Phaser.Loader.prototype = {
     finishedLoading: function (abnormal)
     {
 
-        if (this.hasLoaded)
+        // Destroy could have occurred while loading
+        if (this.hasLoaded || !this.game.state)
         {
             return;
         }
@@ -2180,16 +2181,9 @@ Phaser.Loader.prototype = {
 
         this.game.state.loadUpdate();
         this.onBeforeLoadComplete.dispatch();
-
         this.reset();
-
         this.onLoadComplete.dispatch();
-
-        // Check if the state still exists since destroy could have occurred while loading
-        if (this.game.state)
-        {
-            this.game.state.loadComplete();
-        }
+        this.game.state.loadComplete();
 
     },