mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-04-05 21:47:38 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '2.0'

Browse source
This commit is contained in:
Felix Geyer 2016-08-04 00:08:53 +02:00 • committed by Jonathan White
commit c78822f6e6
12 changed files with 120 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/gui/DatabaseTabWidget.cpp
View file

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