ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-11 01:37:24 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #2500 from nebel/window-error-pop-dalamud-style
Some checks failed
Build Dalamud / Build on Windows (push) Waiting to run
Details
Build Dalamud / Check API Compatibility (push) Blocked by required conditions
Details
Build Dalamud / Deploy dalamud-distrib staging (push) Blocked by required conditions
Details
Rollup changes to next version / check (api14) (push) Failing after 4s
Details
Tag Build / Tag Build (push) Successful in 2s
Details

Browse source 
Always pop DalamudStandard style if pushed earlier in Draw
This commit is contained in:
goat 2025-12-10 15:26:12 +01:00 • committed by GitHub
commit e07bda7e58
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 3 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Dalamud/Interface/Windowing/Window.cs
View file

@ -672,16 +672,13 @@ public abstract class Window
Task.FromResult<IDalamudTextureWrap>(tex));
}
if (!this.hasError)
if (isErrorStylePushed)
{
this.PostDraw();
Style.StyleModelV1.DalamudStandard.Pop();
}
else
{
if (isErrorStylePushed)
{
Style.StyleModelV1.DalamudStandard.Pop();
}
this.PostDraw();
}
this.PostHandlePreset(persistence);