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

Merge branch 'develop' into feature/yubikey

Browse Source
This commit is contained in:
Janek Bevendorff
2017-02-25 22:04:57 +01:00
parent 48366d245c 0f1c518592
commit 3230206b69
6 changed files with 96 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/gui/DatabaseWidget.cpp
View File

@@ -287,7 +287,7 @@ void DatabaseWidget::createEntry()
void DatabaseWidget::setIconFromParent()
{
if (!config()->get("UseGroupIconOnEntryCreation", true).toBool()) {
if (!config()->get("UseGroupIconOnEntryCreation").toBool()) {
return;
}
@@ -1073,8 +1073,7 @@ void DatabaseWidget::reloadDatabaseFile()
// Merge the old database into the new one
m_db->setEmitModified(false);
db->merge(m_db);
}
else {
} else {
// 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
m_databaseModified = false;
@@ -1098,16 +1097,10 @@ void DatabaseWidget::reloadDatabaseFile()
restoreGroupEntryFocus(groupBeforeReload, entryBeforeReload);
}
else {
m_messageWidget->showMessage(
tr("Could not parse or unlock the new database file while attempting"
" to autoreload this database."), MessageWidget::Error);
}
}
else {
} else {
m_messageWidget->showMessage(
tr("Could not open the new database file while attempting to autoreload this database."),
MessageWidget::Error);
MessageWidget::Error);
}
// Rewatch the database file