jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-11-13 05:20:00 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge branch 'Cockatrice:master' into master

Browse source
This commit is contained in:
Christian Daniel Jensen 2026-11-03 16:23:35 -07:00 • committed by GitHub
commit 3691ba210a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
libcockatrice_card/libcockatrice/card/database/card_database_loader.cpp
View file

@ -83,7 +83,7 @@ LoadStatus CardDatabaseLoader::loadCardDatabase(const QString &path, CardDatabas
auto startTime = QTime::currentTime(); auto startTime = QTime::currentTime();
LoadStatus tempLoadStatus = NotLoaded; LoadStatus tempLoadStatus = NotLoaded;
if (!path.isEmpty()) { if (!path.isEmpty()) {
QMutexLocker locker(loadFromFileMutex); QMutexLocker locker(&loadFromFileMutex);
tempLoadStatus = loadFromFile(path, data); tempLoadStatus = loadFromFile(path, data);
} }
@ -102,7 +102,7 @@ LoadStatus CardDatabaseLoader::loadCardDatabases(bool ignoreCache)
LoadStatus CardDatabaseLoader::doLoadCardDatabases(bool ignoreCache) LoadStatus CardDatabaseLoader::doLoadCardDatabases(bool ignoreCache)
{ {
QMutexLocker locker(reloadDatabaseMutex); QMutexLocker locker(&reloadDatabaseMutex);
if (!database) { if (!database) {
qCWarning(CardDatabaseLoadingLog) << "Loader has no database pointer"; qCWarning(CardDatabaseLoadingLog) << "Loader has no database pointer";

4
libcockatrice_card/libcockatrice/card/database/card_database_loader.h
View file

@ -177,8 +177,8 @@ private:
ICardSetPriorityController *priorityController; /**< Controller for reconstructing set state. */ ICardSetPriorityController *priorityController; /**< Controller for reconstructing set state. */
QList<ICardDatabaseParser *> availableParsers; /**< List of available parsers for different formats. */ QList<ICardDatabaseParser *> availableParsers; /**< List of available parsers for different formats. */
QBasicMutex *loadFromFileMutex = new QBasicMutex(); /**< Mutex for single-file loading. */ QBasicMutex loadFromFileMutex; /**< Mutex for single-file loading. */
QBasicMutex *reloadDatabaseMutex = new QBasicMutex(); /**< Mutex for reloading entire database. */ QBasicMutex reloadDatabaseMutex; /**< Mutex for reloading entire database. */
}; };
#endif // COCKATRICE_CARD_DATABASE_LOADER_H #endif // COCKATRICE_CARD_DATABASE_LOADER_H

4
libcockatrice_network/libcockatrice/network/client/remote/remote_client.cpp
View file

@ -173,8 +173,8 @@ void RemoteClient::processServerIdentificationEvent(const Event_ServerIdentifica
// Quote the server-supplied strings in the log and limit their size. // Quote the server-supplied strings in the log and limit their size.
const QString serverName = QString::fromStdString(event.server_name()).left(256); const QString serverName = QString::fromStdString(event.server_name()).left(256);
const QString serverVersion = QString::fromStdString(event.server_version()).left(256); const QString serverVersion = QString::fromStdString(event.server_version()).left(256);
qCInfo(RemoteClientLog) << "Server identification:" << serverName qCInfo(RemoteClientLog) << "Server identification:" << serverName << "version" << serverVersion
<< "version" << serverVersion << "protocol version" << event.protocol_version(); << "protocol version" << event.protocol_version();
if (event.protocol_version() != protocolVersion) { if (event.protocol_version() != protocolVersion) {
emit protocolVersionMismatch(protocolVersion, event.protocol_version()); emit protocolVersionMismatch(protocolVersion, event.protocol_version());
setStatus(StatusDisconnecting); setStatus(StatusDisconnecting);