From 6d640324c13f913f57bc92a540376e7ec00fee6f Mon Sep 17 00:00:00 2001
From: Evan Debenham <Evan@ShatteredPixel.com>
Date: Mon, 26 Jan 2026 14:25:47 -0500
Subject: [PATCH] v3.3.5: added a safety check to new save windows logic

---
 .../shatteredpixeldungeon/scenes/GameScene.java               | 4 ++--
 1 file changed, 2 insertions(+), 2 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 f256edb08..f6e6fd032 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/GameScene.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/GameScene.java
@@ -1593,7 +1593,7 @@ public class GameScene extends PixelScene {
 	@Override
 	public synchronized void saveWindows() {
 		super.saveWindows();
-		if (scene.inventory != null && scene.inventory.getSelector() != null){
+		if (scene != null && scene.inventory != null && scene.inventory.getSelector() != null){
 			savedSelector = scene.inventory.getSelector();
 		} else {
 			for (Gizmo g : members.toArray(new Gizmo[0])){
@@ -1613,7 +1613,7 @@ public class GameScene extends PixelScene {
 	public synchronized void restoreWindows() {
 		super.restoreWindows();
 		if (savedSelector != null){
-			if (scene.inventory != null){
+			if (scene != null && scene.inventory != null){
 				scene.inventory.setSelector(savedSelector);
 			} else {
 				addToFront(new WndBag(Dungeon.hero.belongings.backpack, savedSelector));