From 8823fc79753c6dd78f04d0be0a7994cc2b2115bb Mon Sep 17 00:00:00 2001
From: yuyoyuppe <a.yuyoyuppe@gmail.com>
Date: Tue, 13 Sep 2022 14:08:14 +0200
Subject: [PATCH] [MeasureTool] Don't use Environment.Exit(0);

---
 src/modules/MeasureTool/MeasureToolUI/App.xaml.cs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/modules/MeasureTool/MeasureToolUI/App.xaml.cs b/src/modules/MeasureTool/MeasureToolUI/App.xaml.cs
index 348f1f9b94..c7afbc5065 100644
--- a/src/modules/MeasureTool/MeasureToolUI/App.xaml.cs
+++ b/src/modules/MeasureTool/MeasureToolUI/App.xaml.cs
@@ -5,6 +5,7 @@
 using System;
 using ManagedCommon;
 using MeasureToolUI.Helpers;
+using Microsoft.UI.Dispatching;
 using Microsoft.UI.Xaml;
 
 namespace MeasureToolUI
@@ -36,9 +37,10 @@ namespace MeasureToolUI
             {
                 if (int.TryParse(cmdArgs[cmdArgs.Length - 1], out int powerToysRunnerPid))
                 {
+                    var dispatcher = DispatcherQueue.GetForCurrentThread();
                     RunnerHelper.WaitForPowerToysRunner(powerToysRunnerPid, () =>
                     {
-                        Environment.Exit(0);
+                        dispatcher.TryEnqueue(App.Current.Exit);
                     });
                 }
             }
@@ -51,7 +53,8 @@ namespace MeasureToolUI
             catch (Exception ex)
             {
                 Logger.LogError($"MeasureToolCore failed to initialize: {ex}");
-                Environment.Exit(1);
+                App.Current.Exit();
+                return;
             }
 
             _window = new MainWindow(core);