From fb5ac675bdbe8e345e2b6105cd1255013190c3b7 Mon Sep 17 00:00:00 2001
From: Marc-Aurel Zent <marc_aurel@me.com>
Date: Tue, 8 Nov 2022 22:38:50 +0100
Subject: [PATCH] make Framework updateHook and destroyHook nullable

---
 Dalamud/Game/Framework.cs | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/Dalamud/Game/Framework.cs b/Dalamud/Game/Framework.cs
index 98f430d4a..e64980c5d 100644
--- a/Dalamud/Game/Framework.cs
+++ b/Dalamud/Game/Framework.cs
@@ -30,8 +30,8 @@ public sealed class Framework : IDisposable, IServiceType
 
     private readonly Stopwatch updateStopwatch = new();
 
-    private readonly Hook<OnUpdateDetour> updateHook;
-    private readonly Hook<OnRealDestroyDelegate> destroyHook;
+    private readonly Hook<OnUpdateDetour>? updateHook;
+    private readonly Hook<OnRealDestroyDelegate>? destroyHook;
 
     private readonly object runOnNextTickTaskListSync = new();
     private List<RunOnNextTickTaskBase> runOnNextTickTaskList = new();
@@ -328,14 +328,14 @@ public sealed class Framework : IDisposable, IServiceType
         this.RunOnFrameworkThread(() =>
         {
             // ReSharper disable once AccessToDisposedClosure
-            this.updateHook.Disable();
+            this.updateHook?.Disable();
 
             // ReSharper disable once AccessToDisposedClosure
-            this.destroyHook.Disable();
+            this.destroyHook?.Disable();
         }).Wait();
 
-        this.updateHook.Dispose();
-        this.destroyHook.Dispose();
+        this.updateHook?.Dispose();
+        this.destroyHook?.Dispose();
 
         this.updateStopwatch.Reset();
         statsStopwatch.Reset();
@@ -344,8 +344,8 @@ public sealed class Framework : IDisposable, IServiceType
     [ServiceManager.CallWhenServicesReady]
     private void ContinueConstruction()
     {
-        this.updateHook.Enable();
-        this.destroyHook.Enable();
+        this.updateHook!.Enable();
+        this.destroyHook!.Enable();
     }
 
     private void RunPendingTickTasks()
@@ -455,7 +455,7 @@ public sealed class Framework : IDisposable, IServiceType
         }
 
         original:
-        return this.updateHook.OriginalDisposeSafe(framework);
+        return this.updateHook?.OriginalDisposeSafe(framework) ?? false;
     }
 
     private bool HandleFrameworkDestroy(IntPtr framework)