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/processrunner.cpp | 37 +++++++++++++++++++++++++++----------
 1 file changed, 27 insertions(+), 10 deletions(-)

(limited to 'src/processrunner.cpp')

diff --git a/src/processrunner.cpp b/src/processrunner.cpp
index e6f916c5..b732204c 100644
--- a/src/processrunner.cpp
+++ b/src/processrunner.cpp
@@ -593,9 +593,15 @@ ProcessRunner::Results ProcessRunner::run()
       return Error;
     }
 
-    // not all files will return a valid handle even if opening them was
-    // successful, such as inproc handlers (like the photo viewer)
     m_handle = r.stealProcessHandle();
+
+    // not all files will return a valid handle even if opening them was
+    // successful, such as inproc handlers (like the photo viewer); in this
+    // case it's impossible to determine the status, so just say it's still
+    // running
+    if (m_handle == INVALID_HANDLE_VALUE) {
+      return Running;
+    }
   } else {
     if (m_profileName.isEmpty()) {
       const auto* profile = m_core.currentProfile();
@@ -642,18 +648,29 @@ ProcessRunner::Results ProcessRunner::run()
     }
   }
 
-  if (m_handle == INVALID_HANDLE_VALUE || m_lock == LockWidget::NoReason) {
+  return postRun();
+}
+
+ProcessRunner::Results ProcessRunner::postRun()
+{
+  if (m_lock == LockWidget::NoReason) {
     return Running;
-  } else {
-    const auto r = waitForProcessCompletionWithLock(
-      m_handle, &m_exitCode, m_lock);
+  }
 
-    if (r == Completed && m_refresh == Refresh) {
-      m_core.afterRun(m_sp.binary, m_exitCode);
-    }
+  const auto r = waitForProcessCompletionWithLock(
+    m_handle, &m_exitCode, m_lock);
 
-    return r;
+  if (r == Completed && m_refresh == Refresh) {
+    m_core.afterRun(m_sp.binary, m_exitCode);
   }
+
+  return r;
+}
+
+ProcessRunner::Results ProcessRunner::attachToProcess(HANDLE h)
+{
+  m_handle = h;
+  return postRun();
 }
 
 DWORD ProcessRunner::exitCode()
-- 
cgit v1.3.1