jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-14 14:32:15 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Clean up mutexes instead of manually locking/unlocking.

Browse source 
Took 5 minutes
This commit is contained in:
Lukas Brübach 2025-09-25 11:25:24 +02:00
parent 2b4e62ae41
commit 70aed25eef
1 changed files with 3 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
cockatrice/src/database/card_database.cpp
View file

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