mirror/sqlitebrowser
1
0
Fork 0
mirror of https://github.com/sqlitebrowser/sqlitebrowser.git synced 2026-04-24 21:48:38 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix last commit for SQLCipher

Browse Source
This commit is contained in:
Martin Kleusberg
2016-01-27 23:26:03 +01:00
parent 1a7aad0ff0
commit 8ad570d13c
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/MainWindow.cpp
+6 -6
View File
@@ -2234,7 +2234,7 @@ void MainWindow::editEncryption()
// Create the new file first or it won't work
if(ok)
{
QFile file(db.curDBFilename + ".enctemp");
QFile file(db.currentFile() + ".enctemp");
file.open(QFile::WriteOnly);
file.close();
}
@@ -2242,7 +2242,7 @@ void MainWindow::editEncryption()
// Attach a new database using the new settings
qApp->processEvents();
if(ok)
ok = db.executeSQL(QString("ATTACH DATABASE '%1' AS sqlitebrowser_edit_encryption KEY '%2';").arg(db.curDBFilename + ".enctemp").arg(dialog.password()),
ok = db.executeSQL(QString("ATTACH DATABASE '%1' AS sqlitebrowser_edit_encryption KEY '%2';").arg(db.currentFile() + ".enctemp").arg(dialog.password()),
false, false);
qApp->processEvents();
if(ok)
@@ -2260,10 +2260,10 @@ void MainWindow::editEncryption()
// No errors: Then close the current database, switch names, open the new one and if that succeeded delete the old one
fileClose();
QFile::rename(db.curDBFilename, db.curDBFilename + ".enctempold");
QFile::rename(db.curDBFilename + ".enctemp", db.curDBFilename);
if(fileOpen(db.curDBFilename))
QFile::remove(db.curDBFilename + ".enctempold");
QFile::rename(db.currentFile(), db.currentFile() + ".enctempold");
QFile::rename(db.currentFile() + ".enctemp", db.currentFile());
if(fileOpen(db.currentFile()))
QFile::remove(db.currentFile() + ".enctempold");
} else {
QMessageBox::warning(this, qApp->applicationName(), db.lastErrorMessage);
}