[Workspaces] Close editor when PT runner exited. (#34477)

* [Workspaces] Close editor when PT runner exited. * removed trailing whitespace
microsoft · Aug 29, 2024 · d42cd4b · d42cd4b
1 parent 6408898
commit d42cd4b
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/src/modules/Workspaces/WorkspacesEditor/App.xaml.cs b/src/modules/Workspaces/WorkspacesEditor/App.xaml.cs
@@ -57,6 +57,20 @@ private void OnStartup(object sender, StartupEventArgs e)
                 return;
             }
 
+            var args = e?.Args;
+            int powerToysRunnerPid;
+            if (args?.Length > 0)
+            {
+                _ = int.TryParse(args[0], out powerToysRunnerPid);
+
+                Logger.LogInfo($"WorkspacesEditor started from the PowerToys Runner. Runner pid={powerToysRunnerPid}");
+                RunnerHelper.WaitForPowerToysRunner(powerToysRunnerPid, () =>
+                {
+                    Logger.LogInfo("PowerToys Runner exited. Exiting WorkspacesEditor");
+                    Dispatcher.Invoke(Shutdown);
+                });
+            }
+
             ThemeManager = new ThemeManager(this);
 
             if (_mainViewModel == null)

diff --git a/src/modules/Workspaces/WorkspacesModuleInterface/dllmain.cpp b/src/modules/Workspaces/WorkspacesModuleInterface/dllmain.cpp
@@ -309,15 +309,15 @@ class WorkspacesModuleInterface : public PowertoyModuleIface
     {
         Logger::trace(L"Starting Workspaces Editor");
 
-        /*unsigned long powertoys_pid = GetCurrentProcessId();
+        unsigned long powertoys_pid = GetCurrentProcessId();
         std::wstring executable_args = L"";
-        executable_args.append(std::to_wstring(powertoys_pid));*/
+        executable_args.append(std::to_wstring(powertoys_pid));
 
         SHELLEXECUTEINFOW sei{ sizeof(sei) };
         sei.fMask = SEE_MASK_NOCLOSEPROCESS;
         sei.lpFile = L"PowerToys.WorkspacesEditor.exe";
         sei.nShow = SW_SHOWNORMAL;
-        //sei.lpParameters = executable_args.data();
+        sei.lpParameters = executable_args.data();
         if (ShellExecuteExW(&sei))
         {
             Logger::trace("Successfully started the Workspaces Editor");