From: Matthieu Gallien <matthieu.gallien@nextcloud.com>
Date: Tue, 31 Jan 2023 17:41:43 +0000 (+0100)
Subject: fix wrong detectiion of current config file as a config migration
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~11^2~15^2~3
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=1bb9398c2d8ebb6b21f7048aecec9cdfad6ec8c9;p=nextcloud-desktop.git

fix wrong detectiion of current config file as a config migration

Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
---

diff --git a/src/gui/application.cpp b/src/gui/application.cpp
index b20a60117..d8e7291d8 100644
--- a/src/gui/application.cpp
+++ b/src/gui/application.cpp
@@ -157,11 +157,12 @@ bool Application::configVersionMigration()
     const auto anyConfigFileNameList = configDir.entryInfoList({"*.cfg"}, QDir::Files);
     for (const auto &oldConfig : anyConfigFileNameList) {
         const auto oldConfigFileName = oldConfig.fileName();
+        const auto oldConfigFilePath = oldConfig.filePath();
         const auto newConfigFileName = configFile.configFile();
         backupFilesList.append(configFile.backup(oldConfigFileName));
-        if (oldConfigFileName != newConfigFileName) {
-            if (!QFile::rename(oldConfig.filePath(), newConfigFileName)) {
-                qCWarning(lcApplication) << "Failed to rename configuration file from" << oldConfigFileName << "to" << newConfigFileName;
+        if (oldConfigFilePath != newConfigFileName) {
+            if (!QFile::rename(oldConfigFilePath, newConfigFileName)) {
+                qCWarning(lcApplication) << "Failed to rename configuration file from" << oldConfigFilePath << "to" << newConfigFileName;
             }
         }
     }