rixxc/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-12-04 15:39:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Don't show error message when trying to reload a locked database

Browse Source
This commit is contained in:
Janek Bevendorff
2017-02-25 02:34:47 +01:00
parent 873871a42c
commit 311e7802e5
1 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/gui/DatabaseWidget.cpp
View File

@@ -1061,8 +1061,7 @@ void DatabaseWidget::reloadDatabaseFile()
// Merge the old database into the new one // Merge the old database into the new one
m_db->setEmitModified(false); m_db->setEmitModified(false);
db->merge(m_db); db->merge(m_db);
} } else {
else {
// Since we are accepting the new file as-is, internally mark as unmodified // Since we are accepting the new file as-is, internally mark as unmodified
// TODO: when saving is moved out of DatabaseTabWidget, this should be replaced // TODO: when saving is moved out of DatabaseTabWidget, this should be replaced
m_databaseModified = false; m_databaseModified = false;
@@ -1086,16 +1085,9 @@ void DatabaseWidget::reloadDatabaseFile()
restoreGroupEntryFocus(groupBeforeReload, entryBeforeReload); restoreGroupEntryFocus(groupBeforeReload, entryBeforeReload);
} }
else { } else {
MessageBox::critical(this, tr("Autoreload Failed"),
tr("Could not parse or unlock the new database file while attempting"
" to autoreload this database."));
}
}
else {
MessageBox::critical(this, tr("Autoreload Failed"), MessageBox::critical(this, tr("Autoreload Failed"),
tr("Could not open the new database file while attempting to autoreload" tr("Could not open the new database file while attempting to autoreload this database."));
" this database."));
} }
// Rewatch the database file // Rewatch the database file