From a4b100a77a0d993e4709dad303d7dd43d935672f Mon Sep 17 00:00:00 2001
From: Arun Kapila <108220999+cometcake575@users.noreply.github.com>
Date: Thu, 14 May 2026 16:48:42 +0100
Subject: [PATCH] Added a check to ensure SceneIndex is not -1 to SceneWatcher

---
 Source/SaveStates/SceneWatcher.cs | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/Source/SaveStates/SceneWatcher.cs b/Source/SaveStates/SceneWatcher.cs
index 2d2f544..73a216e 100644
--- a/Source/SaveStates/SceneWatcher.cs
+++ b/Source/SaveStates/SceneWatcher.cs
@@ -49,7 +49,12 @@ public static void Init()
                 if (lsi != null)
                     lsi.activeSceneWhenLoaded = GameManager.instance.sceneName;
             };
-            USceneManager.sceneUnloaded += s => scenes.RemoveAt(scenes.FindIndex(d => d.name == s.name));
+            USceneManager.sceneUnloaded += s =>
+            {
+                var index = scenes.FindIndex(d => d.name == s.name);
+                if (index == -1) return;
+                scenes.RemoveAt(index);
+            };
         }
         
         public class LoadedSceneInfo
@@ -85,4 +90,4 @@ public void UpdateSceneNameOverride(On.GameManager.orig_UpdateSceneName orig, Ga
             }
         }
     }
-}
\ No newline at end of file
+}