Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2024-12-28 08:49:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

Detect and display more errors when writing databases.

Browse Source
This commit is contained in:
Felix Geyer 2015-07-20 21:29:36 +02:00
parent 0422943d52
commit 606e36acf3
1 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/gui/DatabaseTabWidget.cpp
View File

@ -295,24 +295,24 @@ bool DatabaseTabWidget::saveDatabase(Database* db)
DatabaseManagerStruct& dbStruct = m_dbList[db]; DatabaseManagerStruct& dbStruct = m_dbList[db];
if (dbStruct.saveToFilename) { if (dbStruct.saveToFilename) {
bool result = false;
QSaveFile saveFile(dbStruct.filePath); QSaveFile saveFile(dbStruct.filePath);
if (saveFile.open(QIODevice::WriteOnly)) { if (saveFile.open(QIODevice::WriteOnly)) {
m_writer.writeDatabase(&saveFile, db); m_writer.writeDatabase(&saveFile, db);
result = saveFile.commit(); if (m_writer.hasError()) {
MessageBox::critical(this, tr("Error"), tr("Writing the database failed.") + "\n\n"
+ m_writer.errorString());
return false;
}
if (!saveFile.commit()) {
MessageBox::critical(this, tr("Error"), tr("Writing the database failed.") + "\n\n"
+ saveFile.errorString());
return false;
}
} }
if (result) { dbStruct.modified = false;
dbStruct.modified = false; updateTabName(db);
updateTabName(db); return true;
return true;
}
else {
MessageBox::critical(this, tr("Error"), tr("Writing the database failed.") + "\n\n"
+ saveFile.errorString());
return false;
}
} }
else { else {
return saveDatabaseAs(db); return saveDatabaseAs(db);
@ -370,6 +370,11 @@ bool DatabaseTabWidget::saveDatabaseAs(Database* db)
} }
m_writer.writeDatabase(&saveFile, db); m_writer.writeDatabase(&saveFile, db);
if (m_writer.hasError()) {
MessageBox::critical(this, tr("Error"), tr("Writing the database failed.") + "\n\n"
+ m_writer.errorString());
return false;
}
if (!saveFile.commit()) { if (!saveFile.commit()) {
MessageBox::critical(this, tr("Error"), tr("Writing the database failed.") + "\n\n" MessageBox::critical(this, tr("Error"), tr("Writing the database failed.") + "\n\n"
+ saveFile.errorString()); + saveFile.errorString());