From 26af3ce5257ebdbd1b195ec67dcecd00116eeab9 Mon Sep 17 00:00:00 2001
From: Markus Goetz <markus@woboq.com>
Date: Mon, 10 Apr 2017 16:15:28 +0200
Subject: [PATCH] Wizard: Improve folder creation (2)

---
 src/gui/accountsettings.cpp | 3 +--
 src/gui/folder.cpp          | 1 +
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gui/accountsettings.cpp b/src/gui/accountsettings.cpp
index 48bbb496b1..c573b8b3d2 100644
--- a/src/gui/accountsettings.cpp
+++ b/src/gui/accountsettings.cpp
@@ -313,10 +313,9 @@ void AccountSettings::slotFolderWizardAccepted()
                                      tr("<p>Could not create local folder <i>%1</i>.")
                                         .arg(QDir::toNativeSeparators(definition.localPath)));
                 return;
-            } else {
-                FileSystem::setFolderMinimumPermissions(definition.localPath);
             }
         }
+        FileSystem::setFolderMinimumPermissions(definition.localPath);
     }
 
     /* take the value from the definition of already existing folders. All folders have
diff --git a/src/gui/folder.cpp b/src/gui/folder.cpp
index d20215a0ed..83ed5c531e 100644
--- a/src/gui/folder.cpp
+++ b/src/gui/folder.cpp
@@ -911,6 +911,7 @@ void Folder::slotAboutToRemoveAllFiles(SyncFileItem::Direction dir, bool *cancel
     }
     *cancel = msgBox.clickedButton() == keepBtn;
     if (*cancel) {
+        FileSystem::setFolderMinimumPermissions(path());
         journalDb()->clearFileTable();
         _lastEtag.clear();
         slotScheduleThisFolder();