jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-09-29 09:22:18 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Small bug fixes

Browse source 
Took 20 minutes


Took 10 seconds
This commit is contained in:
Lukas Brübach 2026-07-27 12:09:51 +02:00
parent ec80acb7ab
commit 48780ccc24
2 changed files with 16 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

12
libcockatrice_card/libcockatrice/card/database/card_database.cpp
View file

@ -241,6 +241,18 @@ void CardDatabase::addFormat(const FormatRulesPtr &format)
void CardDatabase::swapInDatabaseData(CardDatabaseData data) void CardDatabase::swapInDatabaseData(CardDatabaseData data)
{ {
for (const auto &card : cards) {
for (auto *rel : card->getRelatedCards()) {
rel->deleteLater();
}
for (auto *rel : card->getReverseRelatedCards()) {
rel->deleteLater();
}
for (auto *rel : card->getReverseRelatedCards2Me()) {
rel->deleteLater();
}
}
cards = std::move(data.cards); cards = std::move(data.cards);
simpleNameCards = std::move(data.simpleNameCards); simpleNameCards = std::move(data.simpleNameCards);
sets = std::move(data.sets); sets = std::move(data.sets);

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

@ -2,6 +2,7 @@
#include "card_database.h" #include "card_database.h"
#include "card_database_cache.h" #include "card_database_cache.h"
#include "parser/card_database_parser.h"
#include "parser/cockatrice_xml_3.h" #include "parser/cockatrice_xml_3.h"
#include "parser/cockatrice_xml_4.h" #include "parser/cockatrice_xml_4.h"
@ -92,6 +93,8 @@ LoadStatus CardDatabaseLoader::doLoadCardDatabases()
emit loadingStarted(); emit loadingStarted();
qCInfo(CardDatabaseLoadingLog) << "Card Database Loading Started"; qCInfo(CardDatabaseLoadingLog) << "Card Database Loading Started";
ICardDatabaseParser::clearSetlist();
CardDatabaseData data; CardDatabaseData data;
LoadStatus loadStatus = NotLoaded; LoadStatus loadStatus = NotLoaded;
@ -126,6 +129,7 @@ LoadStatus CardDatabaseLoader::doLoadCardDatabases()
qCInfo(CardDatabaseLoadingSuccessOrFailureLog) << "Card Database Loading Success"; qCInfo(CardDatabaseLoadingSuccessOrFailureLog) << "Card Database Loading Success";
emit databaseDataReady(std::move(data)); emit databaseDataReady(std::move(data));
emit loadingFinished(); emit loadingFinished();
database->checkUnknownSets();
} else { } else {
qCInfo(CardDatabaseLoadingSuccessOrFailureLog) << "Card Database Loading Failed"; qCInfo(CardDatabaseLoadingSuccessOrFailureLog) << "Card Database Loading Failed";
emit loadingFailed(); // bring up the settings dialog emit loadingFailed(); // bring up the settings dialog