Merge remote-tracking branch 'origin/master' into api14-rollup

2026-01-03 14:23:40 +01:00 · 2025-12-08 23:19:26 +00:00
1 changed files with 6 additions and 3 deletions
--- a/Dalamud/Interface/Windowing/Window.cs
+++ b/Dalamud/Interface/Windowing/Window.cs
@ -672,13 +672,16 @@ public abstract class Window
                Task.FromResult<IDalamudTextureWrap>(tex));
        }

-        if (isErrorStylePushed)
+        if (!this.hasError)
        {
-            Style.StyleModelV1.DalamudStandard.Pop();
+            this.PostDraw();
        }
        else
        {
-            this.PostDraw();
+            if (isErrorStylePushed)
+            {
+                Style.StyleModelV1.DalamudStandard.Pop();
+            }
        }

        this.PostHandlePreset(persistence);