Folder Wizard: warn when adding a folder which is the parent of a syn…

…c'ed folder issue #7741
owncloud · Feb 19, 2020 · f90bad4 · f90bad4
1 parent 9b6ebe8
commit f90bad4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/changelog/unreleased/7741 b/changelog/unreleased/7741
@@ -0,0 +1,6 @@
+Bugfix: Add Folder Sync Connection sometimes does not warn
+
+Warn when adding a folder sync connection of a remote folder
+for which a subdir is already synchronized
+
+https://github.com/owncloud/client/issues/7741
diff --git a/src/gui/folderwizard.cpp b/src/gui/folderwizard.cpp
@@ -445,6 +445,8 @@ bool FolderWizardRemotePath::isComplete() const
             warnStrings.append(tr("This folder is already being synced."));
         } else if (dir.startsWith(curDir)) {
             warnStrings.append(tr("You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>.").arg(Utility::escape(curDir), Utility::escape(dir)));
+        } else if (curDir.startsWith(dir)) {
+            warnStrings.append(tr("You are already syncing <i>%1</i>, which is a subfolder of <i>%2</i>.").arg(Utility::escape(curDir), Utility::escape(dir)));
         }
     }