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

goatcorp · Sep 21, 2023 · 035ee00 · 035ee00
2 parents 979a546 + cec382d
commit 035ee00
Showing 1 changed file with 12 additions and 1 deletion.
diff --git a/Dalamud/Interface/Windowing/Window.cs b/Dalamud/Interface/Windowing/Window.cs
@@ -1,7 +1,9 @@
+using System;
 using System.Numerics;
 
 using Dalamud.Configuration.Internal;
 using Dalamud.Game.ClientState.Keys;
+using Dalamud.Logging.Internal;
 using FFXIVClientStructs.FFXIV.Client.UI;
 using ImGuiNET;
 
@@ -12,6 +14,8 @@ namespace Dalamud.Interface.Windowing;
 /// </summary>
 public abstract class Window
 {
+    private static readonly ModuleLog Log = new("WindowSystem");
+
     private static bool wasEscPressedLastFrame = false;
 
     private bool internalLastIsOpen = false;
@@ -284,7 +288,14 @@ internal void DrawInternal(DalamudConfiguration? configuration)
         if (this.ShowCloseButton ? ImGui.Begin(this.WindowName, ref this.internalIsOpen, this.Flags) : ImGui.Begin(this.WindowName, this.Flags))
         {
             // Draw the actual window contents
-            this.Draw();
+            try
+            {
+                this.Draw();
+            }
+            catch (Exception ex)
+            {
+                Log.Error(ex, $"Error during Draw(): {this.WindowName}");
+            }
         }
 
         if (wasFocused)