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

feat(tray): Add runtime config option to enable/disable system tray (#4208)

Browse Source
This commit is contained in:
Kishi
2025-09-01 20:07:31 +02:00
committed by GitHub
parent 73f84fb6dd
commit 8bff4d0780
7 changed files with 40 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main.cpp
View File

@@ -112,7 +112,7 @@ void mainThreadLoop(const std::shared_ptr<safe::event_t<bool>> &shutdown_event)
while (true) {
if (shutdown_event->peek()) {
BOOST_LOG(info) << "Shutdown event detected, breaking main loop"sv;
if (tray_is_enabled) {
if (tray_is_enabled && config::sunshine.system_tray) {
system_tray::end_tray();
}
break;
@@ -384,7 +384,7 @@ int main(int argc, char *argv[]) {
}
#endif
if (tray_is_enabled) {
if (tray_is_enabled && config::sunshine.system_tray) {
BOOST_LOG(info) << "Starting system tray"sv;
#ifdef _WIN32
// TODO: Windows has a weird bug where when running as a service and on the first Windows boot,
@@ -418,7 +418,7 @@ int main(int argc, char *argv[]) {
}
// Stop the threaded tray if it was started
if (tray_is_enabled) {
if (tray_is_enabled && config::sunshine.system_tray) {
system_tray::end_tray_threaded();
}
#endif