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

Prevent recursive loads using AutoOpen

Browse source 
* Fix #3334 - AutoOpen is now processed after the database widget is put into view mode to prevent infinite recursion of unlock attempts if two databases  auto open each other.
This commit is contained in:
Jonathan White 2019-11-08 18:05:37 -05:00 • committed by Janek Bevendorff
parent cb9929712c
commit 4edb623745
3 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/gui/DatabaseWidget.cpp
View file

@ -400,7 +400,6 @@ void DatabaseWidget::replaceDatabase(QSharedPointer<Database> db)
m_db = std::move(db);
connectDatabaseSignals();
m_groupView->changeDatabase(m_db);
processAutoOpen();
// Restore the new parent group pointer, if not found default to the root group
// this prevents data loss when merging a database while creating a new entry
@ -946,6 +945,7 @@ void DatabaseWidget::loadDatabase(bool accepted)
if (accepted) {
replaceDatabase(openWidget->database());
switchToMainView();
processAutoOpen();
m_saveAttempts = 0;
emit databaseUnlocked();
if (config()->get("MinimizeAfterUnlock").toBool()) {
@ -1032,6 +1032,7 @@ void DatabaseWidget::unlockDatabase(bool accepted)
m_entryBeforeLock = QUuid();
switchToMainView();
processAutoOpen();
emit databaseUnlocked();
if (senderDialog && senderDialog->intent() == DatabaseOpenDialog::Intent::AutoType) {
@ -1468,6 +1469,7 @@ void DatabaseWidget::reloadDatabaseFile()
}
replaceDatabase(db);
processAutoOpen();
restoreGroupEntryFocus(groupBeforeReload, entryBeforeReload);
m_blockAutoSave = false;
} else {