From: Olivier Goffart <ogoffart@woboq.com>
Date: Mon, 21 Dec 2015 10:06:39 +0000 (+0100)
Subject: Systray: Use the original name for the rename notification #4295
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~1254^2~140
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=48a0ffdc9e5ff046efe394a64b5e0954ac61727b;p=nextcloud-desktop.git

Systray: Use the original name for the rename notification #4295

Otherwise it shows twice as "newname was renamed to newname".
Because _file is set to the new name in PropagateLocalRename::start
---

diff --git a/src/gui/folder.cpp b/src/gui/folder.cpp
index d15efbf6c..2946d1978 100644
--- a/src/gui/folder.cpp
+++ b/src/gui/folder.cpp
@@ -488,7 +488,7 @@ void Folder::bubbleUpSyncResult()
         if(renTarget != renSource) {
             status.set(SyncFileStatus::STATUS_MOVE);
         }
-        createGuiLog( firstItemRenamed->_file, status, renamedItems, firstItemRenamed->_renameTarget );
+        createGuiLog( firstItemRenamed->_originalFile, status, renamedItems, firstItemRenamed->_renameTarget );
     }
 
     createGuiLog( firstItemError->_file,   SyncFileStatus::STATUS_ERROR, errorItems );