From: Olivier Goffart <ogoffart@woboq.com>
Date: Fri, 27 Nov 2020 09:03:32 +0000 (+0100)
Subject: Folder Wizard: warn when adding a folder which is the parent of a sync'ed folder
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~21^2~468^2~132
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=b7193e6a0ef5a04c85a2c58bd2dd8fd83a0c6659;p=nextcloud-desktop.git

Folder Wizard: warn when adding a folder which is the parent of a sync'ed folder

issue #7741
---

diff --git a/src/gui/folderwizard.cpp b/src/gui/folderwizard.cpp
index ae23d2a4a..b329ce959 100644
--- a/src/gui/folderwizard.cpp
+++ b/src/gui/folderwizard.cpp
@@ -454,6 +454,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)));
         }
     }