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

Resolved merge conflict by accepting changes from master

Browse source
This commit is contained in:
Lily 2025-03-13 12:15:12 -04:00
commit 5d8625761c
No known key found for this signature in database
GPG key ID: D916CEDDF4F93CE7
5 changed files with 426 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

4
cockatrice/src/deck/deck_list_model.cpp
View file

@ -262,7 +262,7 @@ bool DeckListModel::setData(const QModelIndex &index, const QVariant &value, con
}
emitRecursiveUpdates(index);
deckList->updateDeckHash();
deckList->refreshDeckHash();
return true;
}
@ -398,7 +398,7 @@ QModelIndex DeckListModel::addCard(const QString &cardName,
cardNode->setCardSetShortName(cardSetName);
cardNode->setCardCollectorNumber(cardInfoSet.getProperty("num"));
cardNode->setCardProviderId(cardInfoSet.getProperty("uuid"));
deckList->updateDeckHash();
deckList->refreshDeckHash();
}
sort(lastKnownColumn, lastKnownOrder);
emitRecursiveUpdates(parentIndex);