fix(SaveGame): check for nullptr in LoadWorld

GothicKit · Feb 24, 2024 · 5dfde14 · 5dfde14
1 parent a6e62ec
commit 5dfde14
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/ZenKit/SaveGame.cs b/ZenKit/SaveGame.cs
@@ -449,16 +449,16 @@ public bool Save(string path, World world, string worldName)
 			return Native.ZkSaveGame_save(_handle, path, world.Handle, worldName);
 		}
 
-		public World LoadWorld()
+		public World? LoadWorld()
 		{
 			var handle = Native.ZkSaveGame_loadCurrentWorld(_handle);
-			return new World(handle);
+			return handle == UIntPtr.Zero ? null : new World(handle);
 		}
 
-		public World LoadWorld(string name)
+		public World? LoadWorld(string name)
 		{
 			var handle = Native.ZkSaveGame_loadWorld(_handle, name);
-			return new World(handle);
+			return handle == UIntPtr.Zero ? null : new World(handle);
 		}
 	}
 }