Fix shutdown when called from tray callback (#1691)
This commit is contained in:
parent
84f1048c94
commit
cfd78b5ce7
1 changed files with 3 additions and 2 deletions
|
|
@ -115,11 +115,12 @@ namespace system_tray {
|
||||||
// If we're running in a service, return a special status to
|
// If we're running in a service, return a special status to
|
||||||
// tell it to terminate too, otherwise it will just respawn us.
|
// tell it to terminate too, otherwise it will just respawn us.
|
||||||
if (GetConsoleWindow() == NULL) {
|
if (GetConsoleWindow() == NULL) {
|
||||||
lifetime::exit_sunshine(ERROR_SHUTDOWN_IN_PROGRESS, false);
|
lifetime::exit_sunshine(ERROR_SHUTDOWN_IN_PROGRESS, true);
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
lifetime::exit_sunshine(0, false);
|
lifetime::exit_sunshine(0, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Tray menu
|
// Tray menu
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue