Prevent recration of db after removal

2 files changed, 15 insertions, 1 deletions

diff --git a/changelog/unreleased/9057 b/changelog/unreleased/9057
new file mode 100644
index 000000000..33943158a
--- /dev/null
+++ b/changelog/unreleased/9057
@@ -0,0 +1,7 @@
+Bugfix: When a folder is removed we leave a database behind
+
+We fixed a bug where we left an empty `sync_journal.db` behind, when we removed a folder/account.
+As we use the presence of `sync_journal.db` to determine whether the folder is used by a sync client this
+prevented using an old folder in a new setup.
+
+https://github.com/owncloud/client/issues/9057
diff --git a/src/gui/folder.cpp b/src/gui/folder.cpp
index 55f0eb5d0..08fcc6496 100644
--- a/src/gui/folder.cpp
+++ b/src/gui/folder.cpp
@@ -793,6 +793,13 @@ void Folder::slotTerminateSync()
 
 void Folder::wipeForRemoval()
 {
+    // prevent interaction with the db etc
+    _vfsIsReady = false;
+
+    // stop reacting to changes
+    // especially the upcoming deletion of the db
+    _folderWatcher.reset();
+
     // Delete files that have been partially downloaded.
     slotDiscardDownloadProgress();
 
@@ -806,7 +813,7 @@ void Folder::wipeForRemoval()
     QFile file(stateDbFile);
     if (file.exists()) {
         if (!file.remove()) {
-            qCWarning(lcFolder) << "Failed to remove existing csync StateDB " << stateDbFile;
+            qCCritical(lcFolder) << "Failed to remove existing csync StateDB " << stateDbFile;
         } else {
             qCInfo(lcFolder) << "wipe: Removed csync StateDB " << stateDbFile;
         }