From: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
Date: Sun, 12 Jul 2020 08:13:14 +0000 (+0200)
Subject: Only attempt to move if file exist
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~222^2^2~73^2~1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=bc20edc582008f470ae7ba978ad8a0ec70f8342f;p=nextcloud-desktop.git

Only attempt to move if file exist

Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
---

diff --git a/src/gui/folderman.cpp b/src/gui/folderman.cpp
index d9cb19889..c859175d6 100644
--- a/src/gui/folderman.cpp
+++ b/src/gui/folderman.cpp
@@ -219,9 +219,16 @@ void FolderMan::setupFoldersHelper(QSettings &settings, AccountStatePtr account,
                 auto settings = account->settings();
 
                 auto journalFileMoveSuccess = true;
-                journalFileMoveSuccess = oldJournal.rename(folderDefinition.journalPath);
-                journalFileMoveSuccess = oldJournalShm.rename(folderDefinition.journalPath.append("-shm"));
-                journalFileMoveSuccess = oldJournalWal.rename(folderDefinition.journalPath.append("-wal"));
+                // Due to db logic can't be sure which of these file exist.
+                if (oldJournal.exists()) {
+                    journalFileMoveSuccess = oldJournal.rename(folderDefinition.journalPath);
+                }
+                if (oldJournalShm.exists()) {
+                    journalFileMoveSuccess = oldJournalShm.rename(folderDefinition.journalPath.append("-shm"));
+                }
+                if (oldJournalWal.exists()) {
+                    journalFileMoveSuccess = oldJournalWal.rename(folderDefinition.journalPath.append("-wal"));
+                }
 
                 if (!journalFileMoveSuccess) {
                     qCWarning(lcFolderMan) << "Wasn't able to move pre-2.7 syncjournal databse files to new location. One-time loss off sync settings possible.";