setSyncOptions must be called after the vfs plugin changed (#9825)

Fixes: #9824

2 files changed, 5 insertions, 7 deletions

diff --git a/src/gui/accountsettings.cpp b/src/gui/accountsettings.cpp
index 3a5488d38..2fd40b121 100644
--- a/src/gui/accountsettings.cpp
+++ b/src/gui/accountsettings.cpp
@@ -604,11 +604,6 @@ void AccountSettings::slotDisableVfsCurrentFolder()
             folder->setRootPinState(PinState::AlwaysLocal);
             folder->journalDb()->setSelectiveSyncList(SyncJournalDb::SelectiveSyncBlackList, {});
 
-            // Prevent issues with missing local files
-            folder->slotNextSyncFullLocalDiscovery();
-
-            FolderMan::instance()->scheduleFolder(folder);
-
             ui->_folderList->doItemsLayout();
         };
 
diff --git a/src/gui/folder.cpp b/src/gui/folder.cpp
index 849c58cc1..10e20eecd 100644
--- a/src/gui/folder.cpp
+++ b/src/gui/folder.cpp
@@ -105,7 +105,7 @@ Folder::Folder(const FolderDefinition &definition,
     if (checkLocalPath()) {
         // those errors should not persist over sessions
         _journal.wipeErrorBlacklistCategory(SyncJournalErrorBlacklistRecord::Category::LocalSoftError);
-        _engine.reset(new SyncEngine(_accountState->account(), loadSyncOptions(), webDavUrl(), path(), remotePath(), &_journal));
+        _engine.reset(new SyncEngine(_accountState->account(), webDavUrl(), path(), remotePath(), &_journal));
         // pass the setting if hidden files are to be ignored, will be read in csync_update
         _engine->setIgnoreHiddenFiles(_definition.ignoreHiddenFiles);
 
@@ -586,6 +586,7 @@ void Folder::startVfs()
         QString stateDbFile = _journal.databaseFilePath();
         _vfs->fileStatusChanged(stateDbFile + QStringLiteral("-wal"), SyncFileStatus::StatusExcluded);
         _vfs->fileStatusChanged(stateDbFile + QStringLiteral("-shm"), SyncFileStatus::StatusExcluded);
+        _engine->setSyncOptions(loadSyncOptions());
         _vfsIsReady = true;
         slotScheduleThisFolder();
     });
@@ -759,12 +760,14 @@ void Folder::setVirtualFilesEnabled(bool enabled)
         disconnect(_vfs.data(), nullptr, this, nullptr);
         disconnect(&_engine->syncFileStatusTracker(), nullptr, _vfs.data(), nullptr);
 
+        _vfsIsReady = false;
         _vfs.reset(createVfsFromPlugin(newMode).release());
 
         _definition.virtualFilesMode = newMode;
         startVfs();
-        if (newMode != Vfs::Off)
+        if (newMode != Vfs::Off) {
             _saveInFoldersWithPlaceholders = true;
+        }
         saveToSettings();
     }
 }