mirrors/nextcloud-desktop
3
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2025-10-26 11:17:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

HACK to avoid continuation: See task #1448

Browse Source 
We do not know the _modtime from the server, at this point, so just set
the current one.  (rather than the one locally)
This commit is contained in:
Klaas Freitag 2014-04-04 10:50:40 +02:00
parent 4bcd620c29
commit 435e7e3eec
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/mirall/owncloudpropagator.cpp
View File

@ -19,6 +19,7 @@
#include "propagator_qnam.h"
#include "propagatorjobs.h"
#include "propagator_legacy.h"
#include "mirall/utility.h"
#include <QStack>
@ -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;