From 31cd5531d030838a30d55bcd63cadfff4ecd50ca Mon Sep 17 00:00:00 2001
From: isanae <14251494+isanae@users.noreply.github.com>
Date: Wed, 18 Dec 2019 17:21:52 -0500
Subject: windows 7 doesn't play well with job objects, so just wait on
 individual handles fixed getProcessTreeFromProcess() not behaving like
 getProcessTreeFromJob()

---
 src/envmodule.cpp | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

(limited to 'src/envmodule.cpp')

diff --git a/src/envmodule.cpp b/src/envmodule.cpp
index 8d348b5e..5be52de6 100644
--- a/src/envmodule.cpp
+++ b/src/envmodule.cpp
@@ -545,23 +545,20 @@ void findChildren(Process& parent, const std::vector<Process>& processes)
 
 Process getProcessTreeFromProcess(HANDLE h)
 {
+  Process root;
+
   const auto parentPID = ::GetProcessId(h);
   const auto v = getRunningProcesses();
 
-  Process root;
   for (auto&& p : v) {
     if (p.pid() == parentPID) {
-      root = p;
+      Process child = p;
+      findChildren(child, v);
+      root.addChild(child);
       break;
     }
   }
 
-  if (root.pid() == 0) {
-    return {};
-  }
-
-  findChildren(root, v);
-
   return root;
 }
 
-- 
cgit v1.3.1