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

Fix issues with locking database

Browse source 
* Fix #6593 - force close any modal dialogs associated with a database widget that is being locked.

* Partial fix for #721 but doesn't address the problem of needing to save a modified entry or database while locking.

* Also improves import dialog behavior if databases(s) lock while it is visible.
This commit is contained in:
Jonathan White 2024-05-05 09:46:03 -04:00
parent 6b62beab6e
commit bd449f3226
3 changed files with 25 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/gui/DatabaseWidget.cpp
View file

@ -1755,9 +1755,17 @@ bool DatabaseWidget::lock()
emit databaseLockRequested();
// ignore event if we are active and a modal dialog is still open (such as a message box or file dialog)
if (isVisible() && QApplication::activeModalWidget()) {
return false;
// Force close any modal widgets associated with this widget
auto modalWidget = QApplication::activeModalWidget();
if (modalWidget) {
auto parent = modalWidget->parentWidget();
while (parent) {
if (parent == this) {
modalWidget->close();
break;
}
parent = parent->parentWidget();
}
}
clipboard()->clearCopiedText();