From: Claudio Cambra <claudio.cambra@nextcloud.com>
Date: Tue, 24 Jan 2023 15:59:43 +0000 (+0100)
Subject: Don't shadow rec variable in removeLocalE2eFiles
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~11^2~30^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=3e00df4732c7cad76e800827588ba57530370fec;p=nextcloud-desktop.git

Don't shadow rec variable in removeLocalE2eFiles

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
---

diff --git a/src/gui/folder.cpp b/src/gui/folder.cpp
index 05f61d6b8..0ae2004ee 100644
--- a/src/gui/folder.cpp
+++ b/src/gui/folder.cpp
@@ -1345,14 +1345,14 @@ void Folder::removeLocalE2eFiles()
             bool parentPathEncrypted = false;
 
             while (pathDir.cdUp() && pathDir != folderRootDir) {
-                SyncJournalFileRecord rec;
+                SyncJournalFileRecord dirRec;
                 const auto currentCanonicalPath = pathDir.canonicalPath();
-                const auto ok = _journal.getFileRecord(currentCanonicalPath, &rec);
-                if (!ok) {
+
+                if (!_journal.getFileRecord(currentCanonicalPath, &dirRec)) {
                     qCWarning(lcFolder) << "Failed to get file record for" << currentCanonicalPath;
                 }
 
-                if (rec._isE2eEncrypted) {
+                if (dirRec._isE2eEncrypted) {
                     parentPathEncrypted = true;
                     break;
                 }