From 1ed8afba091242a9fa2a68cd4b8eef0aa418bd5f Mon Sep 17 00:00:00 2001
From: Klaas Freitag <freitag@owncloud.com>
Date: Fri, 4 Oct 2013 16:41:15 +0200
Subject: [PATCH] Minor changes.

---
 src/mirall/csyncthread.cpp        | 7 +++++--
 src/mirall/owncloudpropagator.cpp | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/mirall/csyncthread.cpp b/src/mirall/csyncthread.cpp
index 8df1d18784..f01b35b260 100644
--- a/src/mirall/csyncthread.cpp
+++ b/src/mirall/csyncthread.cpp
@@ -534,8 +534,11 @@ void CSyncThread::startNextTransfer()
             _journal->setFileRecord(_directoriesToUpdate.pop());
         }
 
-        if (!_lastDeleted.isEmpty() && item._file.startsWith(_lastDeleted)
-                && item._instruction == CSYNC_INSTRUCTION_REMOVE) {
+        if (!_lastDeleted.isEmpty() &&
+            item._file.startsWith(_lastDeleted) ) {
+            if( item._instruction != CSYNC_INSTRUCTION_REMOVE ) {
+                qDebug() << "WRN: Child of a deleted directory has different instruction than delete.";
+            }
             // If the item's name starts with the name of the previously deleted directory, we
             // can assume this file was already destroyed by the previous recursive call.
             _journal->deleteFileRecord(item._file);
diff --git a/src/mirall/owncloudpropagator.cpp b/src/mirall/owncloudpropagator.cpp
index 2c32470cc8..ffb3378cc8 100644
--- a/src/mirall/owncloudpropagator.cpp
+++ b/src/mirall/owncloudpropagator.cpp
@@ -600,8 +600,8 @@ csync_instructions_e OwncloudPropagator::downloadFile(const SyncFileItem &item,
     QFile::remove(newName);
     success = tmpFile.rename(newName);
 #endif
+    // unixoids
     if (!success) {
-
         _errorString = tmpFile.errorString();
         _status = SyncFileItem::NormalError;
         return CSYNC_INSTRUCTION_ERROR;