From 70aed25eef33edbc84b86a43477743d4d22aeadd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lukas=20Br=C3=BCbach?= <Bruebach.Lukas@bdosecurity.de>
Date: Thu, 25 Sep 2025 11:25:24 +0200
Subject: [PATCH] Clean up mutexes instead of manually locking/unlocking.

Took 5 minutes
---
 cockatrice/src/database/card_database.cpp | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/cockatrice/src/database/card_database.cpp b/cockatrice/src/database/card_database.cpp
index 3523748ad..7959b2ba5 100644
--- a/cockatrice/src/database/card_database.cpp
+++ b/cockatrice/src/database/card_database.cpp
@@ -43,7 +43,7 @@ CardDatabase::~CardDatabase()
 
 void CardDatabase::clear()
 {
-    clearDatabaseMutex->lock();
+    QMutexLocker locker(clearDatabaseMutex);
 
     for (const auto &card : cards.values()) {
         if (card) {
@@ -58,8 +58,6 @@ void CardDatabase::clear()
     ICardDatabaseParser::clearSetlist();
 
     loadStatus = NotLoaded;
-
-    clearDatabaseMutex->unlock();
 }
 
 void CardDatabase::addCard(CardInfoPtr card)
@@ -102,10 +100,9 @@ void CardDatabase::removeCard(CardInfoPtr card)
     for (auto *cardRelation : card->getReverseRelatedCards2Me())
         cardRelation->deleteLater();
 
-    removeCardMutex->lock();
+    QMutexLocker locker(removeCardMutex);
     cards.remove(card->getName());
     simpleNameCards.remove(card->getSimpleName());
-    removeCardMutex->unlock();
     emit cardRemoved(card);
 }
 
@@ -275,9 +272,8 @@ LoadStatus CardDatabase::loadCardDatabase(const QString &path)
     auto startTime = QTime::currentTime();
     LoadStatus tempLoadStatus = NotLoaded;
     if (!path.isEmpty()) {
-        loadFromFileMutex->lock();
+        QMutexLocker locker(loadFromFileMutex);
         tempLoadStatus = loadFromFile(path);
-        loadFromFileMutex->unlock();
     }
 
     int msecs = startTime.msecsTo(QTime::currentTime());