T-Gander/Sunshine
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fix(tray): fix compiling without system tray enabled (#5284)

Browse Source
This commit is contained in:
Kishi
2026-06-12 19:05:50 +02:00
committed by GitHub
parent ea88d71c29
commit 4ad69aaa20
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cmake/compile_definitions/common.cmake
View File

@@ -125,8 +125,6 @@ if(NOT SUNSHINE_ASSETS_DIR_DEF)
endif() endif()
list(APPEND SUNSHINE_DEFINITIONS SUNSHINE_ASSETS_DIR="${SUNSHINE_ASSETS_DIR_DEF}") list(APPEND SUNSHINE_DEFINITIONS SUNSHINE_ASSETS_DIR="${SUNSHINE_ASSETS_DIR_DEF}")
list(APPEND SUNSHINE_DEFINITIONS SUNSHINE_TRAY=${SUNSHINE_TRAY})
# Publisher metadata # Publisher metadata
list(APPEND SUNSHINE_DEFINITIONS SUNSHINE_PUBLISHER_NAME="${SUNSHINE_PUBLISHER_NAME}") list(APPEND SUNSHINE_DEFINITIONS SUNSHINE_PUBLISHER_NAME="${SUNSHINE_PUBLISHER_NAME}")
list(APPEND SUNSHINE_DEFINITIONS SUNSHINE_PUBLISHER_WEBSITE="${SUNSHINE_PUBLISHER_WEBSITE}") list(APPEND SUNSHINE_DEFINITIONS SUNSHINE_PUBLISHER_WEBSITE="${SUNSHINE_PUBLISHER_WEBSITE}")
@@ -166,3 +164,4 @@ else()
set(SUNSHINE_TRAY 0) set(SUNSHINE_TRAY 0)
message(STATUS "Tray icon disabled") message(STATUS "Tray icon disabled")
endif() endif()
list(APPEND SUNSHINE_DEFINITIONS SUNSHINE_TRAY=${SUNSHINE_TRAY})

2
src/main.cpp
View File

@@ -116,7 +116,9 @@ void mainThreadLoop(const std::shared_ptr<safe::event_t<bool>> &shutdown_event)
// Main thread event loop // Main thread event loop
BOOST_LOG(info) << "Starting main loop"sv; BOOST_LOG(info) << "Starting main loop"sv;
#if defined SUNSHINE_TRAY && SUNSHINE_TRAY >= 1
while (system_tray::process_tray_events() == 0); while (system_tray::process_tray_events() == 0);
#endif
BOOST_LOG(info) << "Main loop has exited"sv; BOOST_LOG(info) << "Main loop has exited"sv;
} }