From 6bc70ddd5bedcfcda1d8f6bc4e0eb3f2c4244ac0 Mon Sep 17 00:00:00 2001 From: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com> Date: Mon, 13 Jul 2020 14:02:49 +0200 Subject: [PATCH] Fix typo, use compound assignment op Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com> --- src/gui/folderman.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/gui/folderman.cpp b/src/gui/folderman.cpp index c859175d6..2ac7b6d2f 100644 --- a/src/gui/folderman.cpp +++ b/src/gui/folderman.cpp @@ -221,17 +221,17 @@ void FolderMan::setupFoldersHelper(QSettings &settings, AccountStatePtr account, auto journalFileMoveSuccess = true; // Due to db logic can't be sure which of these file exist. if (oldJournal.exists()) { - journalFileMoveSuccess = oldJournal.rename(folderDefinition.journalPath); + journalFileMoveSuccess &= oldJournal.rename(folderDefinition.journalPath); } if (oldJournalShm.exists()) { - journalFileMoveSuccess = oldJournalShm.rename(folderDefinition.journalPath.append("-shm")); + journalFileMoveSuccess &= oldJournalShm.rename(folderDefinition.journalPath.append("-shm")); } if (oldJournalWal.exists()) { - journalFileMoveSuccess = oldJournalWal.rename(folderDefinition.journalPath.append("-wal")); + 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."; + qCWarning(lcFolderMan) << "Wasn't able to move pre-2.7 syncjournal database files to new location. One-time loss off sync settings possible."; } else { qCInfo(lcFolderMan) << "Successfully migrated syncjournal database."; } -- 2.30.2