From 95ffe1ba037f72c94c47c3b8db6893cc66ede6a7 Mon Sep 17 00:00:00 2001 From: sithlord48 Date: Fri, 19 Jun 2026 17:51:29 -0400 Subject: [PATCH] fix: set new options before reading old ones --- src/lib/server/Config.cpp | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/src/lib/server/Config.cpp b/src/lib/server/Config.cpp index 3e7338803..f798f1c1a 100644 --- a/src/lib/server/Config.cpp +++ b/src/lib/server/Config.cpp @@ -614,6 +614,25 @@ void Config::readSection(ConfigReadContext &s) void Config::readSectionOptions(ConfigReadContext &s) { + if (Settings::value(Settings::Server::EnableHeatbeat).toBool()) { + addOption("", kOptionHeartbeat, Settings::value(Settings::Server::Heartbeat).toInt()); + } + + if (Settings::value(Settings::Server::EnableSwitchDelay).toBool()) { + addOption("", kOptionScreenSwitchDelay, Settings::value(Settings::Server::SwitchDelay).toInt()); + } + + if (Settings::value(Settings::Server::EnableSwitchDoubleTap).toBool()) { + addOption("", kOptionScreenSwitchTwoTap, Settings::value(Settings::Server::SwitchDoubleTap).toInt()); + } + + addOption("", kOptionDefaultLockToScreenState, Settings::value(Settings::Server::DefaultLockToComputerState).toInt()); + addOption("", kOptionDisableLockToScreen, Settings::value(Settings::Server::DisableLockToComputer).toInt()); + addOption("", kOptionRelativeMouseMoves, Settings::value(Settings::Server::RelativeMouseMoves).toInt()); + addOption("", kOptionWin32KeepForeground, Settings::value(Settings::Server::Win32KeepForeground).toInt()); + addOption("", kOptionClipboardSharing, Settings::value(Settings::Server::EnableClipboard).toBool()); + addOption("", kOptionClipboardSharingSize, Settings::value(Settings::Server::ClipboardSize).toUInt() * 1024); + std::string line; while (s.readLine(line)) { // check for end of section @@ -704,25 +723,6 @@ void Config::readSectionOptions(ConfigReadContext &s) } } - if (Settings::value(Settings::Server::EnableHeatbeat).toBool()) { - addOption("", kOptionHeartbeat, Settings::value(Settings::Server::Heartbeat).toInt()); - } - - if (Settings::value(Settings::Server::EnableSwitchDelay).toBool()) { - addOption("", kOptionScreenSwitchDelay, Settings::value(Settings::Server::SwitchDelay).toInt()); - } - - if (Settings::value(Settings::Server::EnableSwitchDoubleTap).toBool()) { - addOption("", kOptionScreenSwitchTwoTap, Settings::value(Settings::Server::SwitchDoubleTap).toInt()); - } - - addOption("", kOptionDefaultLockToScreenState, Settings::value(Settings::Server::DefaultLockToComputerState).toInt()); - addOption("", kOptionDisableLockToScreen, Settings::value(Settings::Server::DisableLockToComputer).toInt()); - addOption("", kOptionRelativeMouseMoves, Settings::value(Settings::Server::RelativeMouseMoves).toInt()); - addOption("", kOptionWin32KeepForeground, Settings::value(Settings::Server::Win32KeepForeground).toInt()); - addOption("", kOptionClipboardSharing, Settings::value(Settings::Server::EnableClipboard).toBool()); - addOption("", kOptionClipboardSharingSize, Settings::value(Settings::Server::ClipboardSize).toUInt() * 1024); - throw ServerConfigReadException(s, "unexpected end of options section"); }