From d72e94a92f31bcc720d12ed0cb2cc75b590e6770 Mon Sep 17 00:00:00 2001
From: isanae <14251494+isanae@users.noreply.github.com>
Date: Thu, 31 Oct 2019 03:54:18 -0400
Subject: added attachToProcess(), made waitForApplication() private changed
 OrganizerProxy::startApplication() so it _doesn't_ wait for completion, which
 is its original behaviour

---
 src/organizerproxy.cpp | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

(limited to 'src/organizerproxy.cpp')

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)
   {
-- 
cgit v1.3.1