jyapayne/Sunshine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

build(win): use UCRT64 environment instead of MinGW64. (#2323)

Browse source 
Co-authored-by: Conn O'Griofa <connogriofa@gmail.com>
This commit is contained in:
Tejas Rao 2024-05-25 13:28:14 -07:00 • committed by GitHub
commit fed482caf0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 40 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/config.cpp
View file

@ -1272,10 +1272,16 @@ namespace config {
BOOST_LOG(fatal) << "Failed to apply config: "sv << err.what();
}
if (!config_loaded) {
#ifdef _WIN32
// UCRT64 raises an access denied exception if launching from the shortcut
// as non-admin and the config folder is not yet present; we can defer
// so that service instance will do the work instead.
if (!config_loaded && !shortcut_launch) {
BOOST_LOG(fatal) << "To relaunch Sunshine successfully, use the shortcut in the Start Menu. Do not run Sunshine.exe manually."sv;
std::this_thread::sleep_for(10s);
#else
if (!config_loaded) {
#endif
return -1;
}
@ -1283,6 +1289,8 @@ namespace config {
#ifdef _WIN32
// We have to wait until the config is loaded to handle these launches,
// because we need to have the correct base port loaded in our config.
// Exception: UCRT64 shortcut_launch instances may have no config loaded due to
// insufficient permissions to create folder; port defaults will be acceptable.
if (service_admin_launch) {
// This is a relaunch as admin to start the service
service_ctrl::start_service();