Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2024-12-25 15:29:44 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix crash on database open from browser (#9939)

Browse Source
This commit is contained in:
Sami Vänttinen 2023-10-24 06:08:41 +03:00 committed by GitHub
parent f93adaa854
commit 6f5f600559
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/browser/BrowserService.cpp
View File

@ -116,7 +116,7 @@ bool BrowserService::openDatabase(bool triggerUnlock)
return true; return true;
} }
if (triggerUnlock) { if (triggerUnlock && !m_bringToFrontRequested) {
m_bringToFrontRequested = true; m_bringToFrontRequested = true;
updateWindowState(); updateWindowState();
emit requestUnlock(); emit requestUnlock();

9
src/gui/DatabaseTabWidget.cpp
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2021 KeePassXC Team <team@keepassxc.org> * Copyright (C) 2023 KeePassXC Team <team@keepassxc.org>
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -41,6 +41,7 @@ DatabaseTabWidget::DatabaseTabWidget(QWidget* parent)
, m_dbWidgetStateSync(new DatabaseWidgetStateSync(this)) , m_dbWidgetStateSync(new DatabaseWidgetStateSync(this))
, m_dbWidgetPendingLock(nullptr) , m_dbWidgetPendingLock(nullptr)
, m_databaseOpenDialog(new DatabaseOpenDialog(this)) , m_databaseOpenDialog(new DatabaseOpenDialog(this))
, m_databaseOpenInProgress(false)
{ {
auto* tabBar = new QTabBar(this); auto* tabBar = new QTabBar(this);
tabBar->setAcceptDrops(true); tabBar->setAcceptDrops(true);
@ -857,6 +858,7 @@ void DatabaseTabWidget::emitDatabaseLockChanged()
emit databaseLocked(dbWidget); emit databaseLocked(dbWidget);
} else { } else {
emit databaseUnlocked(dbWidget); emit databaseUnlocked(dbWidget);
m_databaseOpenInProgress = false;
} }
} }
@ -889,6 +891,11 @@ void DatabaseTabWidget::performGlobalAutoType(const QString& search)
void DatabaseTabWidget::performBrowserUnlock() void DatabaseTabWidget::performBrowserUnlock()
{ {
if (m_databaseOpenInProgress) {
return;
}
m_databaseOpenInProgress = true;
auto dbWidget = currentDatabaseWidget(); auto dbWidget = currentDatabaseWidget();
if (dbWidget && dbWidget->isLocked()) { if (dbWidget && dbWidget->isLocked()) {
unlockAnyDatabaseInDialog(DatabaseOpenDialog::Intent::Browser); unlockAnyDatabaseInDialog(DatabaseOpenDialog::Intent::Browser);

3
src/gui/DatabaseTabWidget.h
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2021 KeePassXC Team <team@keepassxc.org> * Copyright (C) 2023 KeePassXC Team <team@keepassxc.org>
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -117,6 +117,7 @@ private:
QPointer<DatabaseWidget> m_dbWidgetPendingLock; QPointer<DatabaseWidget> m_dbWidgetPendingLock;
QPointer<DatabaseOpenDialog> m_databaseOpenDialog; QPointer<DatabaseOpenDialog> m_databaseOpenDialog;
QTimer m_lockDelayTimer; QTimer m_lockDelayTimer;
bool m_databaseOpenInProgress;
}; };
#endif // KEEPASSX_DATABASETABWIDGET_H #endif // KEEPASSX_DATABASETABWIDGET_H