jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-01 02:53:56 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Put mutex around returning cards on concede (#5964)

Browse source
This commit is contained in:
RickyRister 2025-06-08 19:28:59 -07:00 • committed by GitHub
parent 1e0a356cd2
commit 87767be4a6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 4 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
common/server_player.cpp
View file

@ -920,6 +920,8 @@ Server_Player::cmdConcede(const Command_Concede & /*cmd*/, ResponseContainer & /
game->removeArrowsRelatedToPlayer(ges, this); game->removeArrowsRelatedToPlayer(ges, this);
game->unattachCards(ges, this); game->unattachCards(ges, this);
playerMutex.lock();
// Return cards to their rightful owners before conceding the game // Return cards to their rightful owners before conceding the game
static const QRegularExpression ownerRegex{"Owner: ?([^\n]+)"}; static const QRegularExpression ownerRegex{"Owner: ?([^\n]+)"};
for (const auto &card : zones.value("table")->getCards()) { for (const auto &card : zones.value("table")->getCards()) {
@ -959,6 +961,8 @@ Server_Player::cmdConcede(const Command_Concede & /*cmd*/, ResponseContainer & /
} }
} }
playerMutex.unlock();
// All borrowed cards have been returned, can now continue cleanup process // All borrowed cards have been returned, can now continue cleanup process
clearZones(); clearZones();