Fix incorrect fixed usage, remove api9 safety code from UiBuilder (go…

…atcorp#1893) * fix incorrect fixed usage * UiBuilder: remove leftover api9 safety code
Flicksie · Jul 4, 2024 · 336d853 · 336d853
1 parent 2272848
commit 336d853
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/Dalamud/Interface/Textures/Internal/TextureManager.Wic.cs b/Dalamud/Interface/Textures/Internal/TextureManager.Wic.cs
@@ -247,13 +247,15 @@ public WicManager(TextureManager textureManager)
                 fixed (Guid* piidWicImagingFactory = &IID.IID_IWICImagingFactory)
                 fixed (Guid* pclsidWicImagingFactory2 = &CLSID.CLSID_WICImagingFactory2)
                 fixed (Guid* piidWicImagingFactory2 = &IID.IID_IWICImagingFactory2)
+                fixed (IWICImagingFactory** ppWicFactory = &this.wicFactory.GetPinnableReference())
+                fixed (IWICImagingFactory2** ppWicFactory2 = &this.wicFactory2.GetPinnableReference())
                 {
                     if (CoCreateInstance(
                             pclsidWicImagingFactory2,
                             null,
                             (uint)CLSCTX.CLSCTX_INPROC_SERVER,
                             piidWicImagingFactory2,
-                            (void**)this.wicFactory2.GetAddressOf()).SUCCEEDED)
+                            (void**)ppWicFactory2).SUCCEEDED)
                     {
                         this.wicFactory2.As(ref this.wicFactory).ThrowOnError();
                     }
@@ -264,7 +266,7 @@ public WicManager(TextureManager textureManager)
                             null,
                             (uint)CLSCTX.CLSCTX_INPROC_SERVER,
                             piidWicImagingFactory,
-                            (void**)this.wicFactory.GetAddressOf()).ThrowOnError();
+                            (void**)ppWicFactory).ThrowOnError();
                     }
                 }
             }

diff --git a/Dalamud/Interface/UiBuilder.cs b/Dalamud/Interface/UiBuilder.cs
@@ -694,10 +694,6 @@ private void OnDraw()
             this.ShowUi?.InvokeSafely();
         }
 
-        // just in case, if something goes wrong, prevent drawing; otherwise it probably will crash.
-        if (!this.FontAtlas.BuildTask.IsCompletedSuccessfully)
-            return;
-
         ImGui.PushID(this.namespaceName);
         if (DoStats)
         {