mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-10-27 23:17:13 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fix compilation after previous rebase

Browse source
This commit is contained in:
Olivier Goffart 2013-05-05 11:31:52 +02:00
parent 662bd4e5fe
commit 71b238031f
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/mirall/owncloudpropagator.cpp
View file

@ -465,7 +465,7 @@ csync_instructions_e OwncloudPropagator::downloadFile(const SyncFileItem &item,
fn.insert(dotLocation, "_conflict-" + QDateTime::fromTime_t(item._modtime).toString("yyyyMMdd-hhmmss"));
if (!f.rename(fn)) {
//If the rename fails, don't replace it.
errorString = f.errorString();
_errorString = f.errorString();
return CSYNC_INSTRUCTION_ERROR;
}
}
@ -485,7 +485,7 @@ csync_instructions_e OwncloudPropagator::downloadFile(const SyncFileItem &item,
FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER|FORMAT_MESSAGE_FROM_SYSTEM,
NULL, ::GetLastError(), MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
(LPWSTR)&string, 0, NULL);
errorString = QString::fromWCharArray(string);
_errorString = QString::fromWCharArray(string);
LocalFree((HLOCAL)string);
return CSYNC_INSTRUCTION_ERROR;
}