From d9807a26930babe0a4ac0769aad3c6c03897b3b9 Mon Sep 17 00:00:00 2001 From: sithlord48 Date: Mon, 31 Mar 2025 14:47:22 -0400 Subject: [PATCH] refactor: Set default process Mode based on Settings type if we are INI Type we in desktop mode if Native (only on windows) we default to Service --- src/lib/common/Settings.cpp | 11 ++++++++--- src/lib/common/Settings.h | 6 ------ 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/lib/common/Settings.cpp b/src/lib/common/Settings.cpp index 28e014564..10aa3d31c 100644 --- a/src/lib/common/Settings.cpp +++ b/src/lib/common/Settings.cpp @@ -109,8 +109,9 @@ QVariant Settings::defaultValue(const QString &key) if (key == Server::Binary) return kServerBinName; - if (key == Core::ElevateMode) + if (key == Core::ElevateMode) { return Settings::ElevateMode::Always; + } if (key == Core::UpdateUrl) return kUrlUpdateCheck; @@ -121,8 +122,12 @@ QVariant Settings::defaultValue(const QString &key) if (key == Core::Port) return 24800; - if (key == Core::ProcessMode) - return defaultProcessMode; + if (key == Core::ProcessMode) { + if (instance()->isNativeMode()) + return Settings::ProcessMode::Service; + else + return Settings::ProcessMode::Desktop; + } if (key == Daemon::LogFile) { #ifdef Q_OS_WIN diff --git a/src/lib/common/Settings.h b/src/lib/common/Settings.h index af0fee730..df5021250 100644 --- a/src/lib/common/Settings.h +++ b/src/lib/common/Settings.h @@ -213,10 +213,4 @@ private: , Settings::Server::ExternalConfigFile }; // clang-format on - -#ifdef Q_OS_WIN - inline static const auto defaultProcessMode = Settings::ProcessMode::Service; -#else - inline static const auto defaultProcessMode = Settings::ProcessMode::Desktop; -#endif };