Make YubiKey::s_interfaceMutex non-recursive

It does not need to be a recursive mutex, as per #7783 (comment).
keepassxreboot · Jun 22, 2024 · 0115713 · 0115713
1 parent 80b483e
commit 0115713
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 16 deletions.
diff --git a/src/keys/drivers/YubiKey.cpp b/src/keys/drivers/YubiKey.cpp
@@ -24,11 +24,7 @@
 #include <QSet>
 #include <QtConcurrent>
 
-#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
-QRecursiveMutex YubiKey::s_interfaceMutex;
-#else
-QMutex YubiKey::s_interfaceMutex(QMutex::Recursive);
-#endif
+QMutex YubiKey::s_interfaceMutex;
 
 YubiKey::YubiKey()
 {

diff --git a/src/keys/drivers/YubiKey.h b/src/keys/drivers/YubiKey.h
@@ -21,15 +21,9 @@
 
 #include <QHash>
 #include <QMultiMap>
+#include <QMutex>
 #include <QObject>
 #include <QTimer>
-#include <qmutex.h>
-
-#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
-#include <QRecursiveMutex>
-#else
-#include <QMutex>
-#endif
 
 #include <botan/secmem.h>
 
@@ -94,11 +88,7 @@ class YubiKey : public QObject
     bool m_initialized = false;
     QString m_error;
 
-#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
-    static QRecursiveMutex s_interfaceMutex;
-#else
     static QMutex s_interfaceMutex;
-#endif
 
     KeyMap m_usbKeys;
     KeyMap m_pcscKeys;