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:
authorKlaas Freitag <freitag@owncloud.com>2014-10-03 13:35:18 +0400
committerKlaas Freitag <freitag@owncloud.com>2014-10-03 13:35:18 +0400
commit41fa562dce72da0a28069a63fbb1f25c7adbf3b9 (patch)
treebf4a7ae81656fea756844c74a307c8a04b17c06f /src/mirall/owncloudpropagator.cpp
parent6c2ce06fead3c36d7d1f8e057d08b35da5c8bc6f (diff)
blacklisting: disable broken remove stale entries function for now.
Diffstat (limited to 'src/mirall/owncloudpropagator.cpp')
-rw-r--r--src/mirall/owncloudpropagator.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/mirall/owncloudpropagator.cpp b/src/mirall/owncloudpropagator.cpp
index 44af5239b..4a94777e5 100644
--- a/src/mirall/owncloudpropagator.cpp
+++ b/src/mirall/owncloudpropagator.cpp
@@ -101,6 +101,10 @@ void PropagateItemJob::done(SyncFileItem::Status status, const QString &errorStr
if( _item._blacklistedInDb ) {
// wipe blacklist entry.
_propagator->_journal->wipeBlacklistEntry(_item._file);
+ // remove a blacklist entry in case the file was moved.
+ if( _item._originalFile != _item._file ) {
+ _propagator->_journal->wipeBlacklistEntry(_item._originalFile);
+ }
}
break;
case SyncFileItem::Conflict: