Block subsequent close clicks while handling the exit

Amethyst/Classes/Interfacing.cs

@@ -22,7 +22,8 @@ public static class Interfacing
 
     public static bool
         IsExitingNow, // App closing check
-        IsExitHandled; // If actions have been done
+        IsExitHandled, // If actions have been done
+        IsExitPending; // If actions are running
 
     public static readonly object UpdateLock = new();
 

Amethyst/MainWindow.xaml.cs

@@ -1856,6 +1856,8 @@ private async void Window_Closed(object sender, WindowEventArgs args)
         // and Handled(false) means Continue()
         // -> Block exiting until we're done
         args.Handled = true;
+
+        if (Interfacing.IsExitPending) return;
         switch (Interfacing.IsExitHandled)
         {
             // Show the close tip (if not shown yet)
@@ -1870,6 +1872,9 @@ private async void Window_Closed(object sender, WindowEventArgs args)
             // Handle all the exit actions (if needed)
             case false:
             {
+                // Mark as handled
+                Interfacing.IsExitPending = true;
+
                 // Hide the update bar now
                 UpdateInfoBar.IsOpen = false;
                 UpdateInfoBar.Opacity = 0.0;
@@ -1878,6 +1883,9 @@ private async void Window_Closed(object sender, WindowEventArgs args)
                 // Run shutdown tasks
                 await ShutdownController.ExecuteAllTasks();
 
+                // Mark as mostly done
+                Interfacing.IsExitPending = true;
+
                 // Make sure any Mica/Acrylic controller is disposed so it doesn't try to
                 // use this closed window.
                 if (_micaController is not null)