Fix to have only one PI instance at any point in time (#2951)

* redirect to the elevated instance if present * add stopevent * PR feedback
microsoft · May 17, 2024 · 2b55fc4 · 2b55fc4
1 parent 5e500fb
commit 2b55fc4
Showing 1 changed file with 41 additions and 6 deletions.
diff --git a/tools/PI/DevHome.PI/Program.cs b/tools/PI/DevHome.PI/Program.cs
@@ -47,6 +47,18 @@ public static void Main(string[] args)
             .ReadFrom.Configuration(configuration)
             .CreateLogger();
 
+        var stopEvent = new EventWaitHandle(false, EventResetMode.ManualReset, $"DevHomePI-{Environment.ProcessId}");
+        ThreadPool.QueueUserWorkItem((o) =>
+        {
+            var waitResult = stopEvent.WaitOne();
+
+            _app?.UIDispatcher?.TryEnqueue(() =>
+            {
+                var primaryWindow = Application.Current.GetService<PrimaryWindow>();
+                primaryWindow.Close();
+            });
+        });
+
         try
         {
             XamlCheckProcessRequirements();
@@ -67,6 +79,9 @@ public static void Main(string[] args)
                     OnActivated(null, AppInstance.GetCurrent().GetActivatedEventArgs());
                 });
             }
+
+            stopEvent.Close();
+            stopEvent.Dispose();
         }
         catch (Exception ex)
         {
@@ -80,25 +95,45 @@ public static void Main(string[] args)
 
     private static async Task<bool> DecideRedirection()
     {
-        AppInstance instance;
         var activatedEventArgs = AppInstance.GetCurrent().GetActivatedEventArgs();
-        if (RuntimeHelper.IsCurrentProcessRunningAsAdmin())
+        var isElevatedInstancePresent = false;
+        var isUnElevatedInstancePresent = false;
+        var instanceList = AppInstance.GetInstances();
+        foreach (var appInstance in instanceList)
+        {
+            if (appInstance.Key.Equals(MainInstanceKey, StringComparison.OrdinalIgnoreCase))
+            {
+                isUnElevatedInstancePresent = true;
+            }
+            else if (appInstance.Key.Equals(ElevatedInstanceKey, StringComparison.OrdinalIgnoreCase))
+            {
+                isElevatedInstancePresent = true;
+            }
+        }
+
+        AppInstance instance;
+        if (isElevatedInstancePresent)
+        {
+            // Redirect to the elevated instance if present.
+            instance = AppInstance.FindOrRegisterForKey(ElevatedInstanceKey);
+        }
+        else if (RuntimeHelper.IsCurrentProcessRunningAsAdmin())
         {
             // Wait for unelevated instance to exit
-            var isUnElevatedInstancePresent = false;
-            do
+            while (isUnElevatedInstancePresent)
             {
                 isUnElevatedInstancePresent = false;
-                var instanceList = AppInstance.GetInstances();
+                instanceList = AppInstance.GetInstances();
                 foreach (var appInstance in instanceList)
                 {
                     if (appInstance.Key.Equals(MainInstanceKey, StringComparison.OrdinalIgnoreCase))
                     {
                         isUnElevatedInstancePresent = true;
+                        var stopAppInstance = new EventWaitHandle(false, EventResetMode.ManualReset, $"DevHomePI-{appInstance.ProcessId}");
+                        stopAppInstance.Set();
                     }
                 }
             }
-            while (isUnElevatedInstancePresent);
 
             // Register the elevated instance key
             instance = AppInstance.FindOrRegisterForKey(ElevatedInstanceKey);