From 034389711301c34c5af0901fedf8d79f9ed4bdec Mon Sep 17 00:00:00 2001
From: Soreepeong <soreepeong@gmail.com>
Date: Sun, 25 Feb 2024 05:31:32 +0900
Subject: [PATCH] Better error message for FontHandle

---
 .../ManagedFontAtlas/Internals/FontHandle.cs       | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/Dalamud/Interface/ManagedFontAtlas/Internals/FontHandle.cs b/Dalamud/Interface/ManagedFontAtlas/Internals/FontHandle.cs
index 47254a5c9..ba890f7c2 100644
--- a/Dalamud/Interface/ManagedFontAtlas/Internals/FontHandle.cs
+++ b/Dalamud/Interface/ManagedFontAtlas/Internals/FontHandle.cs
@@ -24,7 +24,6 @@ internal abstract class FontHandle : IFontHandle
     private static readonly ConditionalWeakTable<LocalPlugin, object> NonMainThreadFontAccessWarning = new();
     private static long nextNonMainThreadFontAccessWarningCheck;
 
-    private readonly InterfaceManager interfaceManager;
     private readonly List<IDisposable> pushedFonts = new(8);
 
     private IFontHandleManager? manager;
@@ -36,7 +35,6 @@ internal abstract class FontHandle : IFontHandle
     /// <param name="manager">An instance of <see cref="IFontHandleManager"/>.</param>
     protected FontHandle(IFontHandleManager manager)
     {
-        this.interfaceManager = Service<InterfaceManager>.Get();
         this.manager = manager;
     }
 
@@ -58,7 +56,11 @@ internal abstract class FontHandle : IFontHandle
     /// Gets the associated <see cref="IFontHandleManager"/>.
     /// </summary>
     /// <exception cref="ObjectDisposedException">When the object has already been disposed.</exception>
-    protected IFontHandleManager Manager => this.manager ?? throw new ObjectDisposedException(this.GetType().Name);
+    protected IFontHandleManager Manager =>
+        this.manager
+        ?? throw new ObjectDisposedException(
+            this.GetType().Name,
+            "Did you write `using (fontHandle)` instead of `using (fontHandle.Push())`?");
 
     /// <inheritdoc/>
     public void Dispose()
@@ -122,7 +124,7 @@ internal abstract class FontHandle : IFontHandle
             }
         }
 
-        this.interfaceManager.EnqueueDeferredDispose(locked);
+        Service<InterfaceManager>.Get().EnqueueDeferredDispose(locked);
         return locked.ImFont;
     }
 
@@ -196,7 +198,7 @@ internal abstract class FontHandle : IFontHandle
         ThreadSafety.AssertMainThread();
 
         // Warn if the client is not properly managing the pushed font stack.
-        var cumulativePresentCalls = this.interfaceManager.CumulativePresentCalls;
+        var cumulativePresentCalls = Service<InterfaceManager>.Get().CumulativePresentCalls;
         if (this.lastCumulativePresentCalls != cumulativePresentCalls)
         {
             this.lastCumulativePresentCalls = cumulativePresentCalls;
@@ -213,7 +215,7 @@ internal abstract class FontHandle : IFontHandle
         if (this.TryLock(out _) is { } locked)
         {
             font = locked.ImFont;
-            this.interfaceManager.EnqueueDeferredDispose(locked);
+            Service<InterfaceManager>.Get().EnqueueDeferredDispose(locked);
         }
 
         var rented = SimplePushedFont.Rent(this.pushedFonts, font);