From f5f04bcc4b5adad89655189c3811999738d2bff9 Mon Sep 17 00:00:00 2001 From: Markus Goetz Date: Fri, 5 Sep 2014 10:06:19 +0200 Subject: [PATCH] SyncEngine: Always return _renameTarget in destination() if possible We want to do this since the instruction is actually ERORR, not RENAME. --- src/mirall/syncfileitem.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/mirall/syncfileitem.h b/src/mirall/syncfileitem.h index 4ce515f4a..b2c521921 100644 --- a/src/mirall/syncfileitem.h +++ b/src/mirall/syncfileitem.h @@ -65,7 +65,10 @@ public: } QString destination() const { - return _instruction == CSYNC_INSTRUCTION_RENAME ? _renameTarget : _file; + if (!_renameTarget.isEmpty()) { + return _renameTarget; + } + return _file; } bool isEmpty() const {