Fix error on puzzle reset

eternagame · Jan 20, 2022 · 5fc539b · 5fc539b
1 parent 51b9627
commit 5fc539b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/src/eterna/pose3D/Pose3D.ts b/src/eterna/pose3D/Pose3D.ts
@@ -73,8 +73,10 @@ export default class Pose3D extends ContainerObject {
     }
 
     public dispose() {
+        this._stage.removeAllComponents();
         this._stage.dispose();
         this._nglDiv.remove();
+        super.dispose();
     }
 
     private initControls() {

diff --git a/src/eterna/pose3D/Pose3DWindow.ts b/src/eterna/pose3D/Pose3DWindow.ts
@@ -141,6 +141,9 @@ export default class Pose3DWindow extends ContainerObject implements MouseWheelL
 
         this._nglSprite = new SpriteObject(Sprite.from(this._nglStage.viewer.renderer.domElement));
         this._nglStage.viewer.signals.rendered.add(() => {
+            // We've removed the 3D view, but NGL hasn't been fully destroyed yet
+            if (!this._nglSprite.display.texture) return;
+
             this._nglSprite.display.texture.update();
             this._nglSprite.display.width = this._currentBounds.width;
             this._nglSprite.display.height = this._currentBounds.height - this.ICON_SIZE;