diff --git a/Dalamud/Interface/Textures/Internal/TextureManager.Wic.cs b/Dalamud/Interface/Textures/Internal/TextureManager.Wic.cs index 047937c46..245a2a9ac 100644 --- a/Dalamud/Interface/Textures/Internal/TextureManager.Wic.cs +++ b/Dalamud/Interface/Textures/Internal/TextureManager.Wic.cs @@ -247,13 +247,15 @@ internal sealed partial class 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 @@ internal sealed partial class 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 index 8626ed56f..1413f3347 100644 --- a/Dalamud/Interface/UiBuilder.cs +++ b/Dalamud/Interface/UiBuilder.cs @@ -694,10 +694,6 @@ public sealed class UiBuilder : IDisposable, IUiBuilder 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) {