better error handling

GHXX · Jun 27, 2021 · 1adce62 · 1adce62
1 parent 729fd47
commit 1adce62
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 11 deletions.
diff --git a/DataInterfaceConsole/Actions/BaseAction.cs b/DataInterfaceConsole/Actions/BaseAction.cs
@@ -39,7 +39,7 @@ protected void AbortIfDiInvalid()
         protected void WaitForIngame()
         {
             bool shown = false;
-            while (!this.di.IsGameRunning())
+            while (!this.di.IsMatchRunning())
             {
                 if (!shown)
                 {

diff --git a/DataInterfaceConsole/Actions/BaseLoadPredefinedVariant.cs b/DataInterfaceConsole/Actions/BaseLoadPredefinedVariant.cs
@@ -15,7 +15,7 @@ protected override void Run()
             int safeBoardLimit = -1;
             try
             {
-                if (!this.di.IsGameRunning()) // if the match isnt running, then use the trap mode to inject it
+                if (!this.di.IsMatchRunning()) // if the match isnt running, then use the trap mode to inject it
                 {
                     at = this.di.asmHelper.PlaceAssemblyTrap(IntPtr.Add(this.di.GameProcess.MainModule.BaseAddress, 0x289C2));
                     Console.WriteLine("Main thread trapped. Please start a game, and then check back here.");

diff --git a/DataInterfaceConsole/Program.cs b/DataInterfaceConsole/Program.cs
@@ -66,8 +66,7 @@ private void Run()
                             }
                             catch (DataInterfaceClosedException ex)
                             {
-                                Util.WriteColored($"Execution of the current action '{a.Name}' was aborted because the game closed or crashed: \n{ex}\n" +
-                                    $"To continue, please press ENTER.", ConsoleColor.Red);
+                                Util.WriteColored($"Execution of the current action '{a.Name}' was aborted because the game closed or crashed: \n{ex}", ConsoleColor.Red);
                                 ConsoleNonBlocking.ClearInputLines();
                             }
                             break;
@@ -80,7 +79,7 @@ private void Run()
                 }
                 catch (DataInterfaceClosedException ex)
                 {
-                    Util.WriteColored($"Execution of the current action selection was aborted because the game closed or crashed: \n{ex}\nTo continue, please press ENTER.", ConsoleColor.Red);
+                    Util.WriteColored($"Execution of the current action selection was aborted because the game closed or crashed: \n{ex}", ConsoleColor.Red);
                     ConsoleNonBlocking.ClearInputLines();
                 }
             }

diff --git a/FiveDChessDataInterface/DataInterface.cs b/FiveDChessDataInterface/DataInterface.cs
@@ -460,7 +460,7 @@ private void SetChessBoardArrayInternal(ChessBoard[] newBoards)
                     this.asmHelper.EnsureArrayCapacity(this.MemLocChessArrayPointer.WithOffset(0x60), szGlobalBitboards, newBoards.Length); // 90*
 
                     // one hanging ref ["5dchesswithmultiversetimetravel.exe"+0014BC10]+0x990
-                       this.asmHelper.EnsureArrayCapacity(this.MemLocChessArrayPointer.WithOffset(0x70), szGlobalBitboards, newBoards.Length); // a0*
+                    this.asmHelper.EnsureArrayCapacity(this.MemLocChessArrayPointer.WithOffset(0x70), szGlobalBitboards, newBoards.Length); // a0*
                     this.asmHelper.EnsureArrayCapacity(this.MemLocChessArrayPointer.WithOffset(0x80), szGlobalBitboards, newBoards.Length); // b0*
                     this.asmHelper.EnsureArrayCapacity(this.MemLocChessArrayPointer.WithOffset(0x90), szGlobalBitboards, newBoards.Length); // c0*
                     this.asmHelper.EnsureArrayCapacity(this.MemLocChessArrayPointer.WithOffset(0xa0), szGlobalBitboards, newBoards.Length); // d0*
@@ -497,11 +497,21 @@ private void SetChessBoardArrayInternal(ChessBoard[] newBoards)
         /// <returns>Returns 0 if it's WHITE's turn, and 1 if it's BLACK's turn.</returns>
         public int GetCurrentPlayersTurn() => this.MemLocCurrentPlayersTurn.GetValue();
 
-        public bool IsGameRunning() => this.MemLocChessArrayPointer.GetValue() != IntPtr.Zero;
+        public bool IsMatchRunning()
+        {
+            try
+            {
+                return this.MemLocChessArrayPointer.GetValue() != IntPtr.Zero;
+            }
+            catch (Exception)
+            {
+                return false;
+            }
+        }
 
         public GameState GetCurrentGameState()
         {
-            if (!IsGameRunning())
+            if (!IsMatchRunning())
             {
                 return GameState.NotStarted;
             }

diff --git a/FiveDChessDataInterface/MemoryHelpers/AssemblyTrap.cs b/FiveDChessDataInterface/MemoryHelpers/AssemblyTrap.cs
@@ -41,9 +41,10 @@ private void PlaceTrap(bool throwOnExistingLock)
 
         public void ReleaseTrap()
         {
-            this.ah.di.ExecuteWhileGameSuspendedLocked(() =>
-                    KernelMethods.WriteMemory(this.ah.gameHandle, this.originalLocation, this.originalCode)
-                ); // restore original code
+            if (this.ah.di.IsValid())
+                this.ah.di.ExecuteWhileGameSuspendedLocked(() =>
+                        KernelMethods.WriteMemory(this.ah.gameHandle, this.originalLocation, this.originalCode)
+                    ); // restore original code
         }
 
         public static AssemblyTrap TrapLocation(IntPtr ptr, AssemblyHelper ah, bool throwOnExistingLock = false)