Skip to content

Commit

Permalink
Fix crash on database open from browser (#9939)
Browse files Browse the repository at this point in the history
  • Loading branch information
varjolintu authored Oct 24, 2023
1 parent f93adaa commit 6f5f600
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/browser/BrowserService.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ bool BrowserService::openDatabase(bool triggerUnlock)
return true;
}

if (triggerUnlock) {
if (triggerUnlock && !m_bringToFrontRequested) {
m_bringToFrontRequested = true;
updateWindowState();
emit requestUnlock();
Expand Down
9 changes: 8 additions & 1 deletion src/gui/DatabaseTabWidget.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2021 KeePassXC Team <[email protected]>
* Copyright (C) 2023 KeePassXC Team <[email protected]>
*
* 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
Expand Down Expand Up @@ -41,6 +41,7 @@ DatabaseTabWidget::DatabaseTabWidget(QWidget* parent)
, m_dbWidgetStateSync(new DatabaseWidgetStateSync(this))
, m_dbWidgetPendingLock(nullptr)
, m_databaseOpenDialog(new DatabaseOpenDialog(this))
, m_databaseOpenInProgress(false)
{
auto* tabBar = new QTabBar(this);
tabBar->setAcceptDrops(true);
Expand Down Expand Up @@ -857,6 +858,7 @@ void DatabaseTabWidget::emitDatabaseLockChanged()
emit databaseLocked(dbWidget);
} else {
emit databaseUnlocked(dbWidget);
m_databaseOpenInProgress = false;
}
}

Expand Down Expand Up @@ -889,6 +891,11 @@ void DatabaseTabWidget::performGlobalAutoType(const QString& search)

void DatabaseTabWidget::performBrowserUnlock()
{
if (m_databaseOpenInProgress) {
return;
}

m_databaseOpenInProgress = true;
auto dbWidget = currentDatabaseWidget();
if (dbWidget && dbWidget->isLocked()) {
unlockAnyDatabaseInDialog(DatabaseOpenDialog::Intent::Browser);
Expand Down
3 changes: 2 additions & 1 deletion src/gui/DatabaseTabWidget.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2021 KeePassXC Team <[email protected]>
* Copyright (C) 2023 KeePassXC Team <[email protected]>
*
* 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
Expand Down Expand Up @@ -117,6 +117,7 @@ private slots:
QPointer<DatabaseWidget> m_dbWidgetPendingLock;
QPointer<DatabaseOpenDialog> m_databaseOpenDialog;
QTimer m_lockDelayTimer;
bool m_databaseOpenInProgress;
};

#endif // KEEPASSX_DATABASETABWIDGET_H

0 comments on commit 6f5f600

Please sign in to comment.