Engine unmounted first and Engine dispose() disposes of the Scene. Ne…

…ed an additional check before disposing the Scene #65
brianzinn · May 31, 2020 · 08bc7c3 · 08bc7c3
1 parent 8c9aefb
commit 08bc7c3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/Engine.tsx b/src/Engine.tsx
@@ -136,8 +136,9 @@ class Engine extends React.Component<EngineProps, EngineState> {
 
   componentWillUnmount () {
     window.removeEventListener('resize', this.onResizeWindow);
-    if (this.engine != null) {
-      this.engine?.dispose();
+
+    if (this.engine !== null) {
+      this.engine!.dispose();
       this.engine = null;
     }
   }

diff --git a/src/Scene.tsx b/src/Scene.tsx
@@ -223,7 +223,9 @@ const Scene: React.FC<SceneProps> = (props: SceneProps, context?: any) => {
           scene.onPointerObservable.remove(pointerMoveObservable);
         }
 
-        scene.dispose();
+        if (scene.isDisposed === false) {
+          scene.dispose();
+        }
       }
     },
     [/* no deps, so called only on un/mount */]