Fix an issue with Brio's IPC causing a crash

Etheirys · Jan 12, 2025 · 5220fa5 · 5220fa5
1 parent 7747f3c
commit 5220fa5
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 17 deletions.
diff --git a/Brio/Capabilities/Actor/ActionTimelineCapability.cs b/Brio/Capabilities/Actor/ActionTimelineCapability.cs
@@ -109,13 +109,13 @@ public unsafe void ApplyBaseOverride(ushort actionTimeline, bool interrupt)
 
     public async void StopSpeedAndResetTimeline(Action? postStopAction = null, bool resetSpeedAfterAction = false)
     {
-        Brio.Log.Fatal($"StopSpeedAndResetTimeline {postStopAction is not null} {resetSpeedAfterAction}");
+        Brio.Log.Verbose($"StopSpeedAndResetTimeline {postStopAction is not null} {resetSpeedAfterAction}");
 
         var oldSpeed = SpeedMultiplier;
 
         SetOverallSpeedOverride(0);
 
-        Brio.Log.Fatal($"SetOverallSpeedOverride {oldSpeed} {SpeedMultiplier}");
+        Brio.Log.Verbose($"SetOverallSpeedOverride {oldSpeed} {SpeedMultiplier}");
 
         await _framework.RunOnTick(() =>
         {
@@ -168,23 +168,23 @@ await _framework.RunOnTick(() =>
             }
             catch(Exception ex)
             {
-                Brio.Log.Fatal(ex, "StopSpeedAndResetTimeline");
+                Brio.Log.Verbose(ex, "StopSpeedAndResetTimeline");
             }
         }, delayTicks: 4);
 
         postStopAction?.Invoke();
 
-        Brio.Log.Fatal($"postStopAction Invoke: {postStopAction is not null}");
+        Brio.Log.Verbose($"postStopAction Invoke: {postStopAction is not null}");
 
         if(resetSpeedAfterAction)
         {
             await _framework.RunOnTick(() =>
             {
-                Brio.Log.Fatal($"SetOverallSpeedOverride 0 {SpeedMultiplier}");
+                Brio.Log.Verbose($"SetOverallSpeedOverride 0 {SpeedMultiplier}");
 
                 SetOverallSpeedOverride(oldSpeed);
 
-                Brio.Log.Fatal($"SetOverallSpeedOverride 1 {SpeedMultiplier}");
+                Brio.Log.Verbose($"SetOverallSpeedOverride 1 {SpeedMultiplier}");
             }, delayTicks: 2);
         }
     }

diff --git a/Brio/Game/Posing/PhysicsService.cs b/Brio/Game/Posing/PhysicsService.cs
@@ -117,21 +117,33 @@ public bool FreezeRevert()
         }
         catch(Exception ex)
         {
-            Brio.Log.Fatal($"Brio encountered Fatal Error, FreezeRevert faild: {ex}");
+            Brio.Log.Fatal($"Brio encountered Fatal Error, FreezeRevert failed: {ex}");
         }
 
         return IsFreezeEnabled;
     }
 
     public bool FreezeEnable()
     {
-        using Process currentProcess = Process.GetCurrentProcess();
+        if(IsFreezeEnabled)
+            return IsFreezeEnabled;
+
+        try
+        {
+            using Process currentProcess = Process.GetCurrentProcess();
 
-        WriteProcessMemory(currentProcess.Handle, freezeSkeletonPhysics1, nopFreezeBytes1, nopFreezeBytes1.Length, out _);
+            WriteProcessMemory(currentProcess.Handle, freezeSkeletonPhysics1, nopFreezeBytes1, nopFreezeBytes1.Length, out _);
 
-        WriteProcessMemory(currentProcess.Handle, freezeSkeletonPhysics2, nopFreezeBytes2, nopFreezeBytes2.Length, out _);
+            WriteProcessMemory(currentProcess.Handle, freezeSkeletonPhysics2, nopFreezeBytes2, nopFreezeBytes2.Length, out _);
 
-        return IsFreezeEnabled = true;
+            IsFreezeEnabled = true;
+        }
+        catch(Exception ex)
+        {
+            Brio.Log.Fatal($"Brio encountered Fatal Error, FreezeRevert failed: {ex}");
+        }
+
+        return IsFreezeEnabled;
     }
 
     public void Dispose()

diff --git a/Brio/IPC/BrioIPCService.cs b/Brio/IPC/BrioIPCService.cs
@@ -22,7 +22,7 @@
 namespace Brio.IPC;
 internal class BrioIPCService : IDisposable
 {
-    public static readonly (int, int) CurrentApiVersion = (2, 0);
+    public static readonly (int, int) CurrentApiVersion = (2, 1);
 
     public bool IsIPCEnabled { get; private set; } = false;
 
@@ -523,18 +523,18 @@ private unsafe float GetActorSpeed_Impl(IGameObject actor)
     private unsafe bool FreezActor_Impl(IGameObject actor)
     {
         if(_gPoseService.IsGPosing == false) return false;
-        Brio.Log.Fatal($"FreezActor_Impl 0");
+        Brio.Log.Verbose($"FreezActor_Impl 0");
 
         if(_entityManager.TryGetEntity(actor.Native(), out var entity))
         {
-            Brio.Log.Fatal($"FreezActor_Impl 1");
+            Brio.Log.Verbose($"FreezActor_Impl 1");
 
             if(entity.TryGetCapability<ActionTimelineCapability>(out var actionTimeline))
             {
-                Brio.Log.Fatal($"FreezActor_Impl 2");
+                Brio.Log.Verbose($"FreezActor_Impl 2");
 
                 actionTimeline.StopSpeedAndResetTimeline();
-                Brio.Log.Fatal($"FreezActor_Impl 3");
+                Brio.Log.Verbose($"FreezActor_Impl 3");
                 return true;
             }
         }
@@ -558,10 +558,15 @@ private unsafe bool UnFreezActor_Impl(IGameObject actor)
     }
 
     public bool FreezePhysics_Impl()
+    {
+        Task.Run(() => { FreezePhysics(); });
+        return true;
+    }
+    public bool FreezePhysics()
     {
         if(_gPoseService.IsGPosing == false) return false;
 
-        Brio.Log.Fatal($"FreezeEnable 0");
+        Brio.Log.Verbose($"FreezeEnable 0");
 
         return _physicsService.FreezeEnable();
     }

diff --git a/Brio/Resources/Embedded/Data/Changelog.txt b/Brio/Resources/Embedded/Data/Changelog.txt
@@ -5,6 +5,10 @@ To open this window again click `Information` on the Scene Manager then -> `View
 	 ---> Brio, Version 0.4.4 <--- 
 --------------------------------------------------------------------------------
 
+---------- 0.4.4.3 ----------
+
+- Fixed an issue with Brio's IPC causing a crash
+
 ---------- 0.4.4.1 ----------
 
 - Fixed an issue with Ears when importing as Body or Expression