From 059adc905d0fcf81677e9c95db39170d5730315e Mon Sep 17 00:00:00 2001
From: loki <loki@fakeemail.com>
Date: Sun, 15 Dec 2019 22:47:55 +0100
Subject: [PATCH] Fix steam not shutting down

---
 sunshine/process.cpp | 19 ++++++++-----------
 sunshine/process.h   |  2 ++
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/sunshine/process.cpp b/sunshine/process.cpp
index 2d3b7fc0..d5439cbe 100644
--- a/sunshine/process.cpp
+++ b/sunshine/process.cpp
@@ -22,19 +22,16 @@ namespace pt = boost::property_tree;
 proc_t proc;
 
 template<class Rep, class Period>
-void process_end(bp::child &proc, const std::chrono::duration<Rep, Period>& rel_time) {
+void process_end(bp::child &proc, bp::group &proc_handle, const std::chrono::duration<Rep, Period>& rel_time) {
   if(!proc.running()) {
     return;
   }
 
-  std::cout << "Interruping Child-Process"sv << std::endl;
-  platf::terminate_process((std::uint64_t) proc.native_handle());
+  std::cout << "Force termination Child-Process"sv << std::endl;
+  proc_handle.terminate();
 
-  // Force termination if it takes too long
-  if(!proc.wait_for(rel_time)) {
-    std::cout << "Force termination Child-Process"sv << std::endl;
-    proc.terminate();
-  }
+  // avoid zombie process
+  proc.wait();
 }
 
 int exe(const std::string &cmd, bp::environment &env, file_t &file, std::error_code &ec) {
@@ -92,10 +89,10 @@ int proc_t::execute(const std::string &name) {
 
   std::cout << "Starting ["sv << proc.cmd << ']' << std::endl;
   if(proc.output.empty() || proc.output == "null"sv) {
-    _process = bp::child(proc.cmd, _env, bp::std_out > bp::null, bp::std_err > bp::null, ec);
+    _process = bp::child(_process_handle, proc.cmd, _env, bp::std_out > bp::null, bp::std_err > bp::null, ec);
   }
   else {
-    _process = bp::child(proc.cmd, _env, bp::std_out > _pipe.get(), bp::std_err > _pipe.get(), ec);
+    _process = bp::child(_process_handle, proc.cmd, _env, bp::std_out > _pipe.get(), bp::std_err > _pipe.get(), ec);
   }
 
   if(ec) {
@@ -116,7 +113,7 @@ void proc_t::_undo_pre_cmd() {
   std::error_code ec;
 
   // Ensure child process is terminated
-  process_end(_process, 10s);
+  process_end(_process, _process_handle, 10s);
 
   if(ec) {
     std::cout << "FATAL Error: System: "sv << ec.message() << std::endl;
diff --git a/sunshine/process.h b/sunshine/process.h
index dd6e2f84..14d43d7e 100644
--- a/sunshine/process.h
+++ b/sunshine/process.h
@@ -64,6 +64,8 @@ private:
   std::unordered_map<std::string, ctx_t> _name_to_proc;
 
   boost::process::child _process;
+  boost::process::group _process_handle;
+
   file_t _pipe;
   std::vector<cmd_t>::const_iterator _undo_it;
   std::vector<cmd_t>::const_iterator _undo_begin;