Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/desktop.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier Goffart <ogoffart@woboq.com>2017-01-26 12:14:30 +0300
committerMarkus Goetz <markus@woboq.com>2017-01-27 17:59:59 +0300
commit65e4afedc4034886463a46885186a9e813e957ba (patch)
treecd2297070db5609c425c6b7e6cb56d0c6cfa48fb /src/gui/owncloudsetupwizard.cpp
parentb76a9654ccba246099ae8305305bc07dd188d764 (diff)
Account Wizard: don't whitelist everything on the first sync if we still want to confirm big folder
Issue: https://github.com/owncloud/client/pull/5340#issuecomment-274564441
Diffstat (limited to 'src/gui/owncloudsetupwizard.cpp')
-rw-r--r--src/gui/owncloudsetupwizard.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/gui/owncloudsetupwizard.cpp b/src/gui/owncloudsetupwizard.cpp
index 4d977e0a4..24910f025 100644
--- a/src/gui/owncloudsetupwizard.cpp
+++ b/src/gui/owncloudsetupwizard.cpp
@@ -533,9 +533,11 @@ void OwncloudSetupWizard::slotAssistantFinished( int result )
if (f) {
f->journalDb()->setSelectiveSyncList(SyncJournalDb::SelectiveSyncBlackList,
_ocWizard->selectiveSyncBlacklist());
- // The user already accepted the selective sync dialog. everything is in the white list
- f->journalDb()->setSelectiveSyncList(SyncJournalDb::SelectiveSyncWhiteList,
+ if (!_ocWizard->isConfirmBigFolderChecked()) {
+ // The user already accepted the selective sync dialog. everything is in the white list
+ f->journalDb()->setSelectiveSyncList(SyncJournalDb::SelectiveSyncWhiteList,
QStringList() << QLatin1String("/"));
+ }
}
_ocWizard->appendToConfigurationLog(tr("<font color=\"green\"><b>Local sync folder %1 successfully created!</b></font>").arg(localFolder));
}