From cfc091d4fb63c2619cb379592b45fa7c71f47146 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sat, 9 Mar 2024 11:51:33 +0100 Subject: [PATCH] Keep fallback to config directory if no data directory is configured for libsyncthing --- syncthingwidgets/misc/syncthinglauncher.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/syncthingwidgets/misc/syncthinglauncher.cpp b/syncthingwidgets/misc/syncthinglauncher.cpp index 640065e..a4c13de 100644 --- a/syncthingwidgets/misc/syncthinglauncher.cpp +++ b/syncthingwidgets/misc/syncthinglauncher.cpp @@ -196,10 +196,11 @@ void SyncthingLauncher::launch(const Settings::Launcher &launcherSettings) } if (launcherSettings.useLibSyncthing) { #ifdef SYNCTHINGWIDGETS_USE_LIBSYNCTHING - LibSyncthing::RuntimeOptions options; - options.configDir = launcherSettings.libSyncthing.configDir.toStdString(); - options.dataDir = launcherSettings.libSyncthing.dataDir.toStdString(); - setLibSyncthingLogLevel(launcherSettings.libSyncthing.logLevel); + const auto &libSyncthingSettings = launcherSettings.libSyncthing; + auto options = LibSyncthing::RuntimeOptions(); + options.configDir = libSyncthingSettings.configDir.toStdString(); + options.dataDir = libSyncthingSettings.dataDir.isEmpty() ? options.configDir : libSyncthingSettings.dataDir.toStdString(); + setLibSyncthingLogLevel(libSyncthingSettings.logLevel); launch(options); #else showLibSyncthingNotSupported();