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:
authorChristian Kamm <mail@ckamm.de>2018-02-23 14:13:42 +0300
committerckamm <mail@ckamm.de>2018-03-06 15:02:54 +0300
commit641eddfbdf79d55eed33ae8543029f21ca03e4a3 (patch)
tree8093a60e9a98c4d31c6beed5b3d607b67282a9d9 /src/gui/syncrunfilelog.cpp
parent61869bb65e99f12b711ae6ebe4632f56a0f39566 (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 73f801b5d..add922cfc 100644
--- a/src/gui/syncrunfilelog.cpp
+++ b/src/gui/syncrunfilelog.cpp
@@ -133,7 +133,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);