Merge pull request #3281 from owncloud/confirm

Confirm feature (sync engine part only)
Esse commit está contido em:
Olivier Goffart
2015-06-10 13:39:52 +02:00
16 arquivos alterados com 295 adições e 109 exclusões
+1 -1
Ver Arquivo
@@ -596,7 +596,7 @@ SyncFileStatus SocketApi::fileStatus(Folder *folder, const QString& systemFileNa
}
// Error if it is in the selective sync blacklistr
foreach(const auto &s, folder->selectiveSyncBlackList()) {
foreach(const auto &s, folder->journalDb()->getSelectiveSyncList(SyncJournalDb::SelectiveSyncBlackList)) {
if (fileNameSlash.startsWith(s)) {
return SyncFileStatus(SyncFileStatus::STATUS_ERROR);
}