diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/GameScene.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/GameScene.java index 2efd866ac..4f8457ea3 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/GameScene.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/GameScene.java @@ -801,7 +801,7 @@ public class GameScene extends PixelScene { public static void ready() { selectCell( defaultCellListener ); QuickSlotButton.cancel(); - scene.toolbar.examining = false; + if (scene != null) scene.toolbar.examining = false; } public static void examineCell( Integer cell ) { diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/Toast.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/Toast.java index af149ba49..7825bcd5e 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/Toast.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/Toast.java @@ -81,7 +81,8 @@ public class Toast extends Component { public synchronized void kill() { super.kill(); //need to also destroy the text so that memory is freed - text.destroy(); + if (text != null) + text.destroy(); } public void text( String txt ) {