From: Olivier Goffart <ogoffart@woboq.com>
Date: Mon, 27 Apr 2015 10:20:11 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/1.8'
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~1673^2~15
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=ddfb7f3b7a8d92d78a4045579613a4a25fbbe127;p=nextcloud-desktop.git

Merge remote-tracking branch 'origin/1.8'
---

ddfb7f3b7a8d92d78a4045579613a4a25fbbe127
diff --cc src/libsync/propagatedownload.cpp
index f251da39b,6aa94eed6..bd82f0e85
--- a/src/libsync/propagatedownload.cpp
+++ b/src/libsync/propagatedownload.cpp
@@@ -337,8 -337,9 +337,9 @@@ void PropagateDownloadFileQNAM::start(
  
      quint64 startSize = _tmpFile.size();
      if (startSize > 0) {
 -        if (startSize == _item._size) {
 +        if (startSize == _item->_size) {
              qDebug() << "File is already complete, no need to download";
+             _tmpFile.close();
              downloadFinished();
              return;
          }
@@@ -489,8 -490,7 +490,7 @@@ QString makeConflictFileName(const QStr
  
  void PropagateDownloadFileQNAM::downloadFinished()
  {
- 
 -    QString fn = _propagator->getFilePath(_item._file);
 +    QString fn = _propagator->getFilePath(_item->_file);
  
      // In case of file name clash, report an error
      // This can happen if another parallel download saved a clashing file.