From fab0e027115d85b01575207f140a5ce2144ed9d6 Mon Sep 17 00:00:00 2001
From: Evan Debenham <Evan.SHPX@gmail.com>
Date: Sun, 28 May 2017 22:59:59 -0400
Subject: [PATCH] v0.6.0: added some safety checks to gamescene

---
 .../shatteredpixeldungeon/scenes/GameScene.java        | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

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 166b610d6..1ecde0573 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/GameScene.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/GameScene.java
@@ -697,11 +697,11 @@ public class GameScene extends PixelScene {
 	}
 	
 	public static void pickUp( Item item ) {
-		scene.toolbar.pickup( item );
+		if (scene != null) scene.toolbar.pickup( item );
 	}
 
 	public static void pickUpJournal( Item item ) {
-		scene.pane.pickup( item );
+		if (scene != null) scene.pane.pickup( item );
 	}
 
 	public static void resetMap() {
@@ -748,8 +748,10 @@ public class GameScene extends PixelScene {
 	}
 	
 	public static void show( Window wnd ) {
-		cancelCellSelector();
-		scene.addToFront( wnd );
+		if (scene != null) {
+			cancelCellSelector();
+			scene.addToFront(wnd);
+		}
 	}
 
 	public static void updateFog(){