izackp/Apollo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix bug causing Sunshine thinking there is still an app running after shutting down app from within the Stream

Browse Source
This commit is contained in:
loki
2019-12-30 19:37:12 +01:00
parent 94e1dc903e
commit 330b0ef8ef
5 changed files with 51 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
sunshine/process.h
View File

@@ -37,6 +37,7 @@ struct cmd_t {
struct ctx_t {
std::vector<cmd_t> prep_cmds;
std::string name;
std::string cmd;
std::string output;
};
@@ -47,21 +48,27 @@ public:
proc_t(
boost::process::environment &&env,
std::unordered_map<std::string, ctx_t> &&name_to_proc) :
std::vector<ctx_t> &&apps) :
_env(std::move(env)),
_name_to_proc(std::move(name_to_proc)) {}
_apps(std::move(apps)) {}
int execute(const std::string &name);
bool running();
int execute(int app_id);
/**
* @return _app_id if a process is running, otherwise returns -1
*/
int running();
~proc_t();
const std::unordered_map<std::string, ctx_t> &get_apps() const;
const std::vector<ctx_t> &get_apps() const;
void terminate();
private:
int _app_id;
boost::process::environment _env;
std::unordered_map<std::string, ctx_t> _name_to_proc;
std::vector<ctx_t> _apps;
boost::process::child _process;
boost::process::group _process_handle;