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

Allow Desktop Streams if Prep Commands fail due to user not being logged in (#1207)

Browse Source
This commit is contained in:
Chase Payne
2023-09-17 14:36:04 -05:00
committed by GitHub
parent 47d4b619b1
commit e3bd932ff6
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/process.cpp
View File

@@ -180,14 +180,19 @@ namespace proc {
auto child = platf::run_command(cmd.elevated, true, cmd.do_cmd, working_dir, _env, _pipe.get(), ec, nullptr); auto child = platf::run_command(cmd.elevated, true, cmd.do_cmd, working_dir, _env, _pipe.get(), ec, nullptr);
if (ec) { if (ec) {
BOOST_LOG(error) << "Couldn't run ["sv << cmd.do_cmd << "]: System: "sv << ec.message(); auto msg = ec == std::errc::no_such_process ? "no active user sessions available" : ec.message();
return -1; BOOST_LOG(error) << "Couldn't run ["sv << cmd.do_cmd << "]: System: "sv << msg;
// We don't want any prep commands failing launch of the desktop.
// This is to prevent the issue where users reboot their PC and need to log in with Sunshine.
// no_such_process is returned when the impersonation fails, which is typically when there is no user session active.
if (!(_app.cmd.empty() && ec == std::errc::no_such_process)) {
return -1;
}
} }
child.wait(); child.wait();
auto ret = child.exit_code(); auto ret = child.exit_code();
if (ret != 0 && ec != std::errc::no_such_process) {
if (ret != 0) {
BOOST_LOG(error) << '[' << cmd.do_cmd << "] failed with code ["sv << ret << ']'; BOOST_LOG(error) << '[' << cmd.do_cmd << "] failed with code ["sv << ret << ']';
return -1; return -1;
} }