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

github.com/owncloud/client.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier Goffart <ogoffart@woboq.com>2018-08-31 17:03:01 +0300
committerOlivier Goffart <olivier@woboq.com>2018-08-31 17:41:23 +0300
commita31eadcadf48fde3cdb354e0a45ec2d183a805cf (patch)
tree1e3aa6a1c7a96831b012f2213973416ae6db5a84 /src/gui/folderstatusmodel.cpp
parent7209fd27a054343d03a882d5adbad1134f890502 (diff)
Discovery: Do full local discovery when changing the ignore files config
Since we are now skipping the full local discovery, we also need to call the method to force a full local discovery while we were making full remote discovery, for the same reason. Same applies when applying a selective sync: Normally there should not be any file or directory with the same same of a blacklisted folder, but if there is one, it was ignored and now need to be taken in account. Also make the F6 shortcut do a full local discovery as well.
Diffstat (limited to 'src/gui/folderstatusmodel.cpp')
-rw-r--r--src/gui/folderstatusmodel.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/gui/folderstatusmodel.cpp b/src/gui/folderstatusmodel.cpp
index ea0c6d5fd..69664efee 100644
--- a/src/gui/folderstatusmodel.cpp
+++ b/src/gui/folderstatusmodel.cpp
@@ -856,6 +856,8 @@ void FolderStatusModel::slotApplySelectiveSync()
foreach (const auto &it, changes) {
folder->journalDb()->avoidReadFromDbOnNextSync(it);
}
+ // Also make sure we see the local file that had been ignored before
+ folder->slotNextSyncFullLocalDiscovery();
FolderMan::instance()->scheduleFolder(folder);
}
}
@@ -1169,6 +1171,8 @@ void FolderStatusModel::slotSyncAllPendingBigFolders()
foreach (const auto &it, undecidedList) {
folder->journalDb()->avoidReadFromDbOnNextSync(it);
}
+ // Also make sure we see the local file that had been ignored before
+ folder->slotNextSyncFullLocalDiscovery();
FolderMan::instance()->scheduleFolder(folder);
}