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

fix crash for real (probably)

Browse source
This commit is contained in:
RickyRister 2024-12-31 19:15:34 -08:00
parent 58042ad9fe
commit 5e728c2796
2 changed files with 22 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

26
cockatrice/src/client/tabs/tab_deck_editor.cpp
View file

@ -1242,6 +1242,23 @@ CardInfoPtr TabDeckEditor::currentCardInfo() const
return CardDatabaseManager::getInstance()->getCard(cardName); return CardDatabaseManager::getInstance()->getCard(cardName);
} }
/**
* Gets the index of all the currently selected card nodes in the decklist table.
* The list is in reverse order of the visual selection, so that rows can be deleted while iterating over them.
*
* @return A model index list containing all selected card nodes
*/
QModelIndexList TabDeckEditor::getSelectedCardNodes() const
{
auto selectedRows = deckView->selectionModel()->selectedRows();
const auto notLeafNode = [this](const auto &index) { return deckModel->hasChildren(index); };
selectedRows.erase(std::remove_if(selectedRows.begin(), selectedRows.end(), notLeafNode), selectedRows.end());
std::reverse(selectedRows.begin(), selectedRows.end());
return selectedRows;
}
void TabDeckEditor::addCardHelper(QString zoneName) void TabDeckEditor::addCardHelper(QString zoneName)
{ {
const CardInfoPtr info = currentCardInfo(); const CardInfoPtr info = currentCardInfo();
@ -1301,8 +1318,7 @@ void TabDeckEditor::actAddCardToSideboard()
void TabDeckEditor::actRemoveCard() void TabDeckEditor::actRemoveCard()
{ {
auto selectedRows = deckView->selectionModel()->selectedRows(); auto selectedRows = getSelectedCardNodes();
std::reverse(selectedRows.begin(), selectedRows.end());
bool modified = false; bool modified = false;
for (const auto &index : selectedRows) { for (const auto &index : selectedRows) {
@ -1372,7 +1388,7 @@ void TabDeckEditor::copyDatabaseCellContents()
void TabDeckEditor::actIncrement() void TabDeckEditor::actIncrement()
{ {
auto selectedRows = deckView->selectionModel()->selectedRows(); auto selectedRows = getSelectedCardNodes();
for (const auto &index : selectedRows) { for (const auto &index : selectedRows) {
offsetCountAtIndex(index, 1); offsetCountAtIndex(index, 1);
@ -1381,9 +1397,7 @@ void TabDeckEditor::actIncrement()
void TabDeckEditor::actDecrement() void TabDeckEditor::actDecrement()
{ {
auto selectedRows = deckView->selectionModel()->selectedRows(); auto selectedRows = getSelectedCardNodes();
// we need to iterate the rows in reverse order since there may be row deletions
std::reverse(selectedRows.begin(), selectedRows.end());
for (const auto &index : selectedRows) { for (const auto &index : selectedRows) {
offsetCountAtIndex(index, -1); offsetCountAtIndex(index, -1);

2
cockatrice/src/client/tabs/tab_deck_editor.h
View file

@ -111,6 +111,8 @@ private:
void recursiveExpand(const QModelIndex &index); void recursiveExpand(const QModelIndex &index);
void openDeckFromFile(const QString &fileName, DeckOpenLocation deckOpenLocation); void openDeckFromFile(const QString &fileName, DeckOpenLocation deckOpenLocation);
QModelIndexList getSelectedCardNodes() const;
CardDatabaseModel *databaseModel; CardDatabaseModel *databaseModel;
CardDatabaseDisplayModel *databaseDisplayModel; CardDatabaseDisplayModel *databaseDisplayModel;
DeckListModel *deckModel; DeckListModel *deckModel;