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

Crashfix for opening Deck editor (#5403)

Browse source 
* CardDatabase::getCards() no longer copies the whole database

---------

Co-authored-by: Jakub Mrowinski <ryder052@outlook.com>
This commit is contained in:
ryder052 2025-01-02 01:25:04 +01:00 • committed by GitHub
parent 34df4cd060
commit 8c0093d453
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
cockatrice/src/dialogs/dlg_move_top_cards_until.cpp
View file

@ -59,8 +59,8 @@ DlgMoveTopCardsUntil::DlgMoveTopCardsUntil(QWidget *parent, QString _expr, uint
*/ */
static bool matchExistsInDb(const FilterString &filterString) static bool matchExistsInDb(const FilterString &filterString)
{ {
const auto cardDatabase = CardDatabaseManager::getInstance(); const auto *cardDatabase = CardDatabaseManager::getInstance();
const auto allCards = cardDatabase->getCardList(); const auto &allCards = cardDatabase->getCardList();
const auto it = std::find_if(allCards.begin(), allCards.end(), const auto it = std::find_if(allCards.begin(), allCards.end(),
[&filterString](const CardInfoPtr &card) { return filterString.check(card); }); [&filterString](const CardInfoPtr &card) { return filterString.check(card); });

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

@ -477,9 +477,9 @@ public:
CardSetPtr getSet(const QString &setName); CardSetPtr getSet(const QString &setName);
bool isProviderIdForPreferredPrinting(const QString &cardName, const QString &providerId); bool isProviderIdForPreferredPrinting(const QString &cardName, const QString &providerId);
static CardInfoPerSet getSetInfoForCard(const CardInfoPtr &_card); static CardInfoPerSet getSetInfoForCard(const CardInfoPtr &_card);
QList<CardInfoPtr> getCardList() const const CardNameMap &getCardList() const
{ {
return cards.values(); return cards;
} }
SetList getSetList() const; SetList getSetList() const;
LoadStatus loadFromFile(const QString &fileName); LoadStatus loadFromFile(const QString &fileName);