From 2df00fbeeba8f334abee50630de9064d41b5211a Mon Sep 17 00:00:00 2001 From: Stone_Red <56473591+Stone-Red-Code@users.noreply.github.com> Date: Wed, 26 Feb 2025 20:22:42 +0100 Subject: [PATCH] Properly remove the plugin window from the lists in the main window when an exception occurs --- src/DesktopMagic/MainWindow.xaml.cs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/DesktopMagic/MainWindow.xaml.cs b/src/DesktopMagic/MainWindow.xaml.cs index 4d5d569..fb861ca 100644 --- a/src/DesktopMagic/MainWindow.xaml.cs +++ b/src/DesktopMagic/MainWindow.xaml.cs @@ -245,8 +245,14 @@ namespace DesktopMagic window.PluginLoaded -= onPluginLoaded; }); }; + window.OnExit += () => { + Windows.Remove(window); + WindowNames.Remove(window.Title); + blockWindowsClosing = false; + window.Close(); + blockWindowsClosing = true; pluginSettings.Enabled = false; }; window.PluginLoaded += onPluginLoaded;