diff options
| author | Daniel Molkentin <danimo@owncloud.com> | 2013-11-04 19:38:55 +0400 |
|---|---|---|
| committer | Daniel Molkentin <danimo@owncloud.com> | 2013-11-04 19:38:55 +0400 |
| commit | cc5f17a7d2d13da569e6c696231f88f225793ffe (patch) | |
| tree | 0b879758c319e0c8e06295a087f7c4f340d9f65e /src/mirall/folderwizard.cpp | |
| parent | 85d5b82811db9903f296805ee882999255c321cb (diff) | |
| parent | f0a1ac43466ec5e111f942496dbaa06d90524063 (diff) | |
Merge remote-tracking branch 'origin/master' into account_refactoring
Conflicts:
src/mirall/accountsettings.cpp
src/mirall/folder.cpp
Diffstat (limited to 'src/mirall/folderwizard.cpp')
| -rw-r--r-- | src/mirall/folderwizard.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mirall/folderwizard.cpp b/src/mirall/folderwizard.cpp index b297c68b7..99bbc38f3 100644 --- a/src/mirall/folderwizard.cpp +++ b/src/mirall/folderwizard.cpp @@ -316,7 +316,7 @@ bool FolderWizardTargetPage::isComplete() const if (dir == curDir) { showWarn( tr("This directory is already being synced.") ); return false; - } else if (dir.startsWith(curDir)) { + } else if (dir.startsWith(curDir + QLatin1Char('/'))) { if (dir.isEmpty()) dir = QLatin1Char('/'); if (curDir.isEmpty()) curDir = QLatin1Char('/'); showWarn( tr("You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>.").arg(curDir).arg(dir) ); |