From: Markus Goetz <markus@woboq.com>
Date: Mon, 10 Apr 2017 14:15:28 +0000 (+0200)
Subject: Wizard: Improve folder creation (2)
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~722^2~49
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=26af3ce5257ebdbd1b195ec67dcecd00116eeab9;p=nextcloud-desktop.git

Wizard: Improve folder creation (2)
---

diff --git a/src/gui/accountsettings.cpp b/src/gui/accountsettings.cpp
index 48bbb496b..c573b8b3d 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 d20215a0e..83ed5c531 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();