From ea6445a4ea13a5dd808877cf782670826853d1cb Mon Sep 17 00:00:00 2001
From: Stone_Red <56473591+Stone-Red-Code@users.noreply.github.com>
Date: Thu, 5 Oct 2023 12:28:16 +0200
Subject: [PATCH] Improve saving and loading classes

---
 .../WorldSaveSystem/WorldLoader.cs            | 19 ++++++++++++++++---
 .../WorldReaders/WorldReaderV1.cs             |  2 +-
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/StoneRed.LogicSimulator/WorldSaveSystem/WorldLoader.cs b/StoneRed.LogicSimulator/WorldSaveSystem/WorldLoader.cs
index d2e7571..32bc131 100644
--- a/StoneRed.LogicSimulator/WorldSaveSystem/WorldLoader.cs
+++ b/StoneRed.LogicSimulator/WorldSaveSystem/WorldLoader.cs
@@ -20,9 +20,22 @@ internal class WorldLoader
 
     public Task<Result<WorldData>> LoadWorld(string saveName, IProgress<WorldSaveLoadProgress> progress)
     {
-        BinaryReader binaryReader = new BinaryReader(File.OpenRead(Paths.GetWorldSaveFilePath(saveName)));
-        ushort fileVersion = binaryReader.ReadUInt16();
-        binaryReader.Close();
+        ushort fileVersion;
+        BinaryReader? binaryReader = null;
+
+        try
+        {
+            binaryReader = new BinaryReader(File.OpenRead(Paths.GetWorldSaveFilePath(saveName)));
+            fileVersion = binaryReader.ReadUInt16();
+        }
+        catch (IOException ex)
+        {
+            return Task.FromResult(Result.Fail<WorldData>(ex.Message));
+        }
+        finally
+        {
+            binaryReader?.Close();
+        }
 
         IWorldReader? worldReader = fileVersion switch
         {
diff --git a/StoneRed.LogicSimulator/WorldSaveSystem/WorldReaders/WorldReaderV1.cs b/StoneRed.LogicSimulator/WorldSaveSystem/WorldReaders/WorldReaderV1.cs
index 7dbb690..2a04977 100644
--- a/StoneRed.LogicSimulator/WorldSaveSystem/WorldReaders/WorldReaderV1.cs
+++ b/StoneRed.LogicSimulator/WorldSaveSystem/WorldReaders/WorldReaderV1.cs
@@ -115,7 +115,7 @@ internal class WorldReaderV1 : IWorldReader
         }
         finally
         {
-            reader?.Dispose();
+            reader?.Close();
         }
     }
 }
\ No newline at end of file