From e0ea89e1cbec749dc910b7faee806f0a49963f29 Mon Sep 17 00:00:00 2001
From: Jonathan White <support@dmapps.us>
Date: Sat, 28 Sep 2024 09:02:57 -0400
Subject: [PATCH] Prevent multiple lock requests on Linux

* Fixes #11000

When the screen locks on e.g. gnome we receive multiple independent signals of that, namely the Gnome session manager and the gnome / freedesktop screensaver.

When this happens, this causes multiple "lock database" requests to be issued. The first one correctly shows the question to discard/cancel, but the second one while the first is still asking goes and dismisses the question and then goes to ask it again. The result is it acts like you didn't answer correctly (ie, to cancel) and the database is locked.
---
 src/gui/DatabaseWidget.cpp | 10 ++++++++--
 src/gui/DatabaseWidget.h   |  1 +
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/gui/DatabaseWidget.cpp b/src/gui/DatabaseWidget.cpp
index b497420b65..2d179192ef 100644
--- a/src/gui/DatabaseWidget.cpp
+++ b/src/gui/DatabaseWidget.cpp
@@ -1941,8 +1941,8 @@ bool DatabaseWidget::focusNextPrevChild(bool next)
 
 bool DatabaseWidget::lock()
 {
-    if (isLocked()) {
-        return true;
+    if (isLocked() || m_attemptingLock) {
+        return isLocked();
     }
 
     // Don't try to lock the database while saving, this will cause a deadlock
@@ -1951,6 +1951,8 @@ bool DatabaseWidget::lock()
         return false;
     }
 
+    m_attemptingLock = true;
+
     emit databaseLockRequested();
 
     // Force close any modal widgets associated with this widget
@@ -1975,6 +1977,7 @@ bool DatabaseWidget::lock()
                                            MessageBox::Discard | MessageBox::Cancel,
                                            MessageBox::Cancel);
         if (result == MessageBox::Cancel) {
+            m_attemptingLock = false;
             return false;
         }
     }
@@ -2001,9 +2004,11 @@ bool DatabaseWidget::lock()
                                                MessageBox::Save);
             if (result == MessageBox::Save) {
                 if (!save()) {
+                    m_attemptingLock = false;
                     return false;
                 }
             } else if (result == MessageBox::Cancel) {
+                m_attemptingLock = false;
                 return false;
             }
         }
@@ -2035,6 +2040,7 @@ bool DatabaseWidget::lock()
     auto newDb = QSharedPointer<Database>::create(m_db->filePath());
     replaceDatabase(newDb);
 
+    m_attemptingLock = false;
     emit databaseLocked();
 
     return true;
diff --git a/src/gui/DatabaseWidget.h b/src/gui/DatabaseWidget.h
index 6622394e1a..aa00fc0abb 100644
--- a/src/gui/DatabaseWidget.h
+++ b/src/gui/DatabaseWidget.h
@@ -320,6 +320,7 @@ private slots:
     QUuid m_entryBeforeLock;
 
     int m_saveAttempts;
+    bool m_attemptingLock = false;
 
     QScopedPointer<RemoteSettings> m_remoteSettings;