ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-15 13:14:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: Remove WaitForFontRebuild during start, this breaks titleedit again for whatever reason

Browse source
This commit is contained in:
goat 2021-04-26 22:05:49 +02:00
parent 9f22b00fc6
commit 74a0cbb034
No known key found for this signature in database
GPG key ID: F18F057873895461
3 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Dalamud/Dalamud.cs
View file

@ -197,6 +197,9 @@ namespace Dalamud
this.Framework = new Framework(this.SigScanner, this); this.Framework = new Framework(this.SigScanner, this);
Log.Information("[SPRE] Framework OK!"); Log.Information("[SPRE] Framework OK!");
this.Framework.Enable();
Log.Information("[SPRE] Framework ENABLE!");
} }
/// <summary> /// <summary>
@ -254,8 +257,6 @@ namespace Dalamud
isInterfaceLoaded = true; isInterfaceLoaded = true;
Log.Information("[SPOST] IM OK!"); Log.Information("[SPOST] IM OK!");
this.InterfaceManager.WaitForFontRebuild();
} }
catch (Exception e) catch (Exception e)
{ {
@ -314,9 +315,6 @@ namespace Dalamud
} }
} }
this.Framework.Enable();
Log.Information("[SPOST] Framework ENABLE!");
this.ClientState.Enable(); this.ClientState.Enable();
Log.Information("[SPOST] CS ENABLE!"); Log.Information("[SPOST] CS ENABLE!");

3
Dalamud/Interface/InterfaceManager.cs
View file

@ -68,6 +68,7 @@ namespace Dalamud.Interface
/// </summary> /// </summary>
public event RawDX11Scene.BuildUIDelegate OnDraw; public event RawDX11Scene.BuildUIDelegate OnDraw;
public bool FontsReady { get; set; } = false;
public InterfaceManager(Dalamud dalamud, SigScanner scanner) public InterfaceManager(Dalamud dalamud, SigScanner scanner)
{ {
@ -380,6 +381,8 @@ namespace Dalamud.Interface
japaneseRangeHandle.Free(); japaneseRangeHandle.Free();
gameRangeHandle.Free(); gameRangeHandle.Free();
iconRangeHandle.Free(); iconRangeHandle.Free();
this.FontsReady = true;
} }
public void WaitForFontRebuild() { public void WaitForFontRebuild() {

3
Dalamud/Interface/UiBuilder.cs
View file

@ -197,6 +197,9 @@ namespace Dalamud.Interface
(this.GposeActive && this.dalamud.Configuration.ToggleUiHideDuringGpose && !(this.DisableGposeUiHide || this.DisableAutomaticUiHide))) (this.GposeActive && this.dalamud.Configuration.ToggleUiHideDuringGpose && !(this.DisableGposeUiHide || this.DisableAutomaticUiHide)))
return; return;
if (!this.dalamud.InterfaceManager.FontsReady)
return;
ImGui.PushID(this.namespaceName); ImGui.PushID(this.namespaceName);
if (DoStats) if (DoStats)
{ {