From bc20edc582008f470ae7ba978ad8a0ec70f8342f Mon Sep 17 00:00:00 2001 From: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com> Date: Sun, 12 Jul 2020 10:13:14 +0200 Subject: [PATCH] Only attempt to move if file exist Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com> --- src/gui/folderman.cpp | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) 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."; -- 2.30.2