added attachToProcess(), made waitForApplication() private

changed OrganizerProxy::startApplication() so it _doesn't_ wait for completion, which is its original behaviour

1 files changed, 10 insertions, 3 deletions

diff --git a/src/organizerproxy.cpp b/src/organizerproxy.cpp
index 9de5b4ba..0b6f8df1 100644
--- a/src/organizerproxy.cpp
+++ b/src/organizerproxy.cpp
@@ -123,9 +123,9 @@ HANDLE OrganizerProxy::startApplication(
 

   auto runner = m_Proxied->processRunner();

 

+  // don't wait for completion

   runner

     .setFromFileOrExecutable(exe, args, cwd, profile, overwrite, ignoreOverwrite)

-    .setWaitForCompletion(ProcessRunner::Refresh)

     .run();

 

   return runner.processHandle();

@@ -139,8 +139,15 @@ bool OrganizerProxy::waitForApplication(HANDLE handle, LPDWORD exitCode) const
     "a plugin wants to wait for an application to complete, pid {}{}",

     pid, (pid == 0 ? "unknown (probably already completed)" : ""));

 

-  const auto r = m_Proxied->processRunner().waitForApplication(

-    handle, exitCode, LockWidget::OutputRequired);

+  auto runner = m_Proxied->processRunner();

+

+  const auto r = runner

+    .setWaitForCompletion(ProcessRunner::NoRefresh, LockWidget::OutputRequired)

+    .attachToProcess(handle);

+

+  if (exitCode) {

+    *exitCode = runner.exitCode();

+  }

 

   switch (r)

   {