journalPath.append(ba.left(6).toHex());
journalPath.append(".db");
- journalPath = dbPath + QLatin1Char('/') + journalPath;
+ journalPath = dbPath + QLatin1Char('/') + journalPath;
// If the journal doesn't exist and we can't create a file
// at that location, try again with a journal name that doesn't
folderDefinition.journalPath = defaultJournalPath;
}
- // Migration #2: journalPath now in DataAppDir, not root of local tree (cross-platform persistent user roaming files)
+ // Migration #2: journalPath now in DataAppDir, not root of local tree (cross-platform persistent user roaming files)
if (folderDefinition.journalPath.at(0) == QChar('.')) {
QFile oldJournal(folderDefinition.localPath + "/" + folderDefinition.journalPath);
QFile oldJournalShm(folderDefinition.localPath + "/" + folderDefinition.journalPath.append("-shm"));
QFile oldJournalWal(folderDefinition.localPath + "/" + folderDefinition.journalPath.append("-wal"));
- folderDefinition.journalPath = defaultJournalPath;
+ folderDefinition.journalPath = defaultJournalPath;
socketApi()->slotUnregisterPath(folderAlias);
auto settings = account->settings();
Folder *f = addFolderInternal(folderDefinition, account.data());
f->saveToSettings();
- oldJournal.remove();
+ oldJournal.remove();
oldJournalShm.remove();
oldJournalWal.remove();