Add workaround to ensure exit works

josetr · Nov 10, 2022 · d7aeb5d · d7aeb5d
1 parent 772d3bc
commit d7aeb5d
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/src/AudioDeviceSwitcher/App.xaml.cs b/src/AudioDeviceSwitcher/App.xaml.cs
@@ -10,6 +10,7 @@ namespace AudioDeviceSwitcher;
 using Activation = Windows.ApplicationModel.Activation;
 using PInvoke;
 using Microsoft.UI.Xaml.Controls;
+using System.Reflection.Metadata.Ecma335;
 
 public sealed partial class App : Application, IApp
 {
@@ -57,7 +58,7 @@ protected override async void OnLaunched(LaunchActivatedEventArgs args)
                 User32.MessageBox(IntPtr.Zero, e.Message, AudioSwitcherState.Title, User32.MessageBoxOptions.MB_ICONERROR);
             }
 
-            Exit();
+            ExitNow();
             return;
         }
 
@@ -67,7 +68,7 @@ protected override async void OnLaunched(LaunchActivatedEventArgs args)
             Kernel32.GetLastError() == Win32ErrorCode.ERROR_ACCESS_DENIED)
         {
             DesktopWindow.BroadcastRestore();
-            Exit();
+            ExitNow();
             return;
         }
 
@@ -82,6 +83,13 @@ protected override async void OnLaunched(LaunchActivatedEventArgs args)
             _window.RunInBackround();
         else
             _window.Activate();
+
+        // TODO: Remove workaround once Application.Exit() gets fixed
+        // See https://github.com/microsoft/microsoft-ui-xaml/issues/5931
+        static void ExitNow()
+        {
+            Environment.Exit(0);
+        }
     }
 
     private static IServiceProvider ConfigureServices()