Keep fallback to config directory if no data directory is configured for libsyncthing
This commit is contained in:
parent
8bc45de18d
commit
cfc091d4fb
|
@ -196,10 +196,11 @@ void SyncthingLauncher::launch(const Settings::Launcher &launcherSettings)
|
||||||
}
|
}
|
||||||
if (launcherSettings.useLibSyncthing) {
|
if (launcherSettings.useLibSyncthing) {
|
||||||
#ifdef SYNCTHINGWIDGETS_USE_LIBSYNCTHING
|
#ifdef SYNCTHINGWIDGETS_USE_LIBSYNCTHING
|
||||||
LibSyncthing::RuntimeOptions options;
|
const auto &libSyncthingSettings = launcherSettings.libSyncthing;
|
||||||
options.configDir = launcherSettings.libSyncthing.configDir.toStdString();
|
auto options = LibSyncthing::RuntimeOptions();
|
||||||
options.dataDir = launcherSettings.libSyncthing.dataDir.toStdString();
|
options.configDir = libSyncthingSettings.configDir.toStdString();
|
||||||
setLibSyncthingLogLevel(launcherSettings.libSyncthing.logLevel);
|
options.dataDir = libSyncthingSettings.dataDir.isEmpty() ? options.configDir : libSyncthingSettings.dataDir.toStdString();
|
||||||
|
setLibSyncthingLogLevel(libSyncthingSettings.logLevel);
|
||||||
launch(options);
|
launch(options);
|
||||||
#else
|
#else
|
||||||
showLibSyncthingNotSupported();
|
showLibSyncthingNotSupported();
|
||||||
|
|
Loading…
Reference in New Issue