smw/deskflow
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
sithlord48 2025-03-31 14:47:22 -04:00 committed by Nick Bolton
parent 1b8067797e
commit d9807a2693
2 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/lib/common/Settings.cpp
View file

@ -109,8 +109,9 @@ QVariant Settings::defaultValue(const QString &key)
if (key == Server::Binary) if (key == Server::Binary)
return kServerBinName; return kServerBinName;
if (key == Core::ElevateMode) if (key == Core::ElevateMode) {
return Settings::ElevateMode::Always; return Settings::ElevateMode::Always;
}
if (key == Core::UpdateUrl) if (key == Core::UpdateUrl)
return kUrlUpdateCheck; return kUrlUpdateCheck;
@ -121,8 +122,12 @@ QVariant Settings::defaultValue(const QString &key)
if (key == Core::Port) if (key == Core::Port)
return 24800; return 24800;
if (key == Core::ProcessMode) if (key == Core::ProcessMode) {
return defaultProcessMode; if (instance()->isNativeMode())
return Settings::ProcessMode::Service;
else
return Settings::ProcessMode::Desktop;
}
if (key == Daemon::LogFile) { if (key == Daemon::LogFile) {
#ifdef Q_OS_WIN #ifdef Q_OS_WIN

6
src/lib/common/Settings.h
View file

@ -213,10 +213,4 @@ private:
, Settings::Server::ExternalConfigFile , Settings::Server::ExternalConfigFile
}; };
// clang-format on // 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
}; };