ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2026-02-17 21:37:43 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #1410 from Haselnussbomber/catch-draw-exception

Browse source
This commit is contained in:
goat 2023-09-21 19:37:34 +02:00 • committed by GitHub
commit 035ee008cf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,7 +1,9 @@
using System;
using System.Numerics; using System.Numerics;
using Dalamud.Configuration.Internal; using Dalamud.Configuration.Internal;
using Dalamud.Game.ClientState.Keys; using Dalamud.Game.ClientState.Keys;
using Dalamud.Logging.Internal;
using FFXIVClientStructs.FFXIV.Client.UI; using FFXIVClientStructs.FFXIV.Client.UI;
using ImGuiNET; using ImGuiNET;
@ -12,6 +14,8 @@ namespace Dalamud.Interface.Windowing;
/// </summary> /// </summary>
public abstract class Window public abstract class Window
{ {
private static readonly ModuleLog Log = new("WindowSystem");
private static bool wasEscPressedLastFrame = false; private static bool wasEscPressedLastFrame = false;
private bool internalLastIsOpen = false; private bool internalLastIsOpen = false;
@ -284,7 +288,14 @@ public abstract class Window
if (this.ShowCloseButton ? ImGui.Begin(this.WindowName, ref this.internalIsOpen, this.Flags) : ImGui.Begin(this.WindowName, this.Flags)) if (this.ShowCloseButton ? ImGui.Begin(this.WindowName, ref this.internalIsOpen, this.Flags) : ImGui.Begin(this.WindowName, this.Flags))
{ {
// Draw the actual window contents // Draw the actual window contents
this.Draw(); try
{
this.Draw();
}
catch (Exception ex)
{
Log.Error(ex, $"Error during Draw(): {this.WindowName}");
}
} }
if (wasFocused) if (wasFocused)