From 435e7e3eecbd2f097531fb9d6ffd91cdda68d0ad Mon Sep 17 00:00:00 2001 From: Klaas Freitag Date: Fri, 4 Apr 2014 10:50:40 +0200 Subject: [PATCH] HACK to avoid continuation: See task #1448 We do not know the _modtime from the server, at this point, so just set the current one. (rather than the one locally) --- src/mirall/owncloudpropagator.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/mirall/owncloudpropagator.cpp b/src/mirall/owncloudpropagator.cpp index 655361b2a3..86df5c4124 100644 --- a/src/mirall/owncloudpropagator.cpp +++ b/src/mirall/owncloudpropagator.cpp @@ -19,6 +19,7 @@ #include "propagator_qnam.h" #include "propagatorjobs.h" #include "propagator_legacy.h" +#include "mirall/utility.h" #include @@ -97,6 +98,10 @@ bool PropagateItemJob::checkForProblemsWithShared(int httpStatusCode, const QStr } else if (downloadItem._instruction == CSYNC_INSTRUCTION_SYNC) { // we modified the file locally, jsut create a conflict then downloadItem._instruction = CSYNC_INSTRUCTION_CONFLICT; + + // HACK to avoid continuation: See task #1448: We do not know the _modtime from the + // server, at this point, so just set the current one. (rather than the one locally) + downloadItem._modtime = Utility::qDateTimeToTime_t(QDateTime::currentDateTime()); } else { // the file was removed or renamed, just recover the old one downloadItem._instruction = CSYNC_INSTRUCTION_SYNC;