jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-13 17:44:48 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Properly check if a duplicate already exists in the list, no longer break loop. (#5470)

Browse source 
Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>
This commit is contained in:
BruebachL 2025-01-14 16:12:53 +01:00 • committed by GitHub
parent f6c1253e84
commit c079715c46
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
cockatrice/src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp
View file

@ -103,8 +103,9 @@ QList<CardInfoPerSet> PrintingSelectorCardSortingWidget::sortSets(const CardInfo
for (auto it = cardInfoPerSets.begin(); it != cardInfoPerSets.end(); ++it) { for (auto it = cardInfoPerSets.begin(); it != cardInfoPerSets.end(); ++it) {
for (const auto &cardInfoPerSet : it.value()) { for (const auto &cardInfoPerSet : it.value()) {
if (cardInfoPerSet.getPtr() == set) { if (cardInfoPerSet.getPtr() == set) {
sortedCardInfoPerSets << cardInfoPerSet; if (!sortedCardInfoPerSets.contains(cardInfoPerSet)) {
break; sortedCardInfoPerSets << cardInfoPerSet;
}
} }
} }
} }

5
cockatrice/src/game/cards/card_database.h
View file

@ -144,6 +144,11 @@ public:
explicit CardInfoPerSet(const CardSetPtr &_set = QSharedPointer<CardSet>(nullptr)); explicit CardInfoPerSet(const CardSetPtr &_set = QSharedPointer<CardSet>(nullptr));
~CardInfoPerSet() = default; ~CardInfoPerSet() = default;
bool operator==(const CardInfoPerSet &other) const
{
return this->set == other.set && this->properties == other.properties;
}
private: private:
CardSetPtr set; CardSetPtr set;
// per-set card properties; // per-set card properties;