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:
authorChristian Kamm <mail@ckamm.de>2018-02-23 14:13:42 +0300
committerCamila San <hello@camila.codes>2018-05-16 17:48:31 +0300
commita0d5e314230757661285eeb93352228426ed9997 (patch)
tree683ee04a19a6ced5289411dd6ee75136733041a3 /src/gui/syncrunfilelog.cpp
parent11b6b48c75d556440c04a35f82bc07668e1bdabd (diff)
INSTRUCTION_IGNORE now carries a direction
This allows IssuesWidget to selectively wipe only the 'Up' ignores during selective local discovery.
Diffstat (limited to 'src/gui/syncrunfilelog.cpp')
-rw-r--r--src/gui/syncrunfilelog.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/syncrunfilelog.cpp b/src/gui/syncrunfilelog.cpp
index 5d8c54765..1fe3f96f2 100644
--- a/src/gui/syncrunfilelog.cpp
+++ b/src/gui/syncrunfilelog.cpp
@@ -162,7 +162,8 @@ void SyncRunFileLog::start(const QString &folderPath)
void SyncRunFileLog::logItem(const SyncFileItem &item)
{
// don't log the directory items that are in the list
- if (item._direction == SyncFileItem::None) {
+ if (item._direction == SyncFileItem::None
+ || item._instruction == CSYNC_INSTRUCTION_IGNORE) {
return;
}
QString ts = QString::fromLatin1(item._responseTimeStamp);