Prevent recration of db after removal

1 files changed, 8 insertions, 1 deletions

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;
         }