diff options
| author | Tomaz Canabrava <tcanabrava@kde.org> | 2018-04-10 17:18:58 +0300 |
|---|---|---|
| committer | Tomaz Canabrava <tcanabrava@kde.org> | 2018-04-10 17:18:58 +0300 |
| commit | 7432d6a81444c5a31226e221a081ae02bb604689 (patch) | |
| tree | 827402e2fa2fe41e1710a5877448ffee35489b14 /src/gui/folder.cpp | |
| parent | 16aa54ed647abdc2b1ac3f6029ae52891739a1ac (diff) | |
| parent | 4c40789dcafe5b193e125620b63dcc95e08ffba5 (diff) | |
Merge branch 'master' into clientSideEncryptionV4
Diffstat (limited to 'src/gui/folder.cpp')
| -rw-r--r-- | src/gui/folder.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gui/folder.cpp b/src/gui/folder.cpp index 66f9d683d..81a782db1 100644 --- a/src/gui/folder.cpp +++ b/src/gui/folder.cpp @@ -409,7 +409,9 @@ void Folder::createGuiLog(const QString &filename, LogStatus status, int count, } if (!text.isEmpty()) { - logger->postOptionalGuiLog(tr("Sync Activity"), text); + // Ignores the settings in case of an error or conflict + if(status == LogStatusError || status == LogStatusConflict) + logger->postOptionalGuiLog(tr("Sync Activity"), text); } } } |