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

Try to find the card again without providerId when searching fails during swap card. (#5814)

Browse source 
Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>
This commit is contained in:
BruebachL 2025-04-09 17:19:21 +02:00 • committed by GitHub
parent 61cb3d1d7c
commit 0bd53d6dc7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
cockatrice/src/client/tabs/abstract_tab_deck_editor.cpp
View file

@ -124,8 +124,13 @@ void AbstractTabDeckEditor::actSwapCard(CardInfoPtr info, QString zoneName)
{ {
QString providerId = CardDatabaseManager::getInstance()->getSetInfoForCard(info).getProperty("uuid"); QString providerId = CardDatabaseManager::getInstance()->getSetInfoForCard(info).getProperty("uuid");
QString collectorNumber = CardDatabaseManager::getInstance()->getSetInfoForCard(info).getProperty("num"); QString collectorNumber = CardDatabaseManager::getInstance()->getSetInfoForCard(info).getProperty("num");
deckDockWidget->swapCard(
deckDockWidget->deckModel->findCard(info->getName(), zoneName, providerId, collectorNumber)); QModelIndex foundCard = deckDockWidget->deckModel->findCard(info->getName(), zoneName, providerId, collectorNumber);
if (!foundCard.isValid()) {
foundCard = deckDockWidget->deckModel->findCard(info->getName(), zoneName);
}
deckDockWidget->swapCard(foundCard);
} }
/** /**
@ -357,6 +362,7 @@ bool AbstractTabDeckEditor::actSaveDeckAs()
dialog.setDefaultSuffix("cod"); dialog.setDefaultSuffix("cod");
dialog.setNameFilters(DeckLoader::FILE_NAME_FILTERS); dialog.setNameFilters(DeckLoader::FILE_NAME_FILTERS);
dialog.selectFile(getDeckList()->getName().trimmed()); dialog.selectFile(getDeckList()->getName().trimmed());
if (!dialog.exec()) if (!dialog.exec())
return false; return false;

4
cockatrice/src/client/tabs/abstract_tab_deck_editor.h
View file

@ -67,7 +67,7 @@ public:
DeckEditorPrintingSelectorDockWidget *printingSelectorDockWidget; DeckEditorPrintingSelectorDockWidget *printingSelectorDockWidget;
public slots: public slots:
void onDeckChanged(); virtual void onDeckChanged();
void updateCard(CardInfoPtr _card); void updateCard(CardInfoPtr _card);
void actAddCard(CardInfoPtr info); void actAddCard(CardInfoPtr info);
void actAddCardToSideboard(CardInfoPtr info); void actAddCardToSideboard(CardInfoPtr info);
@ -90,7 +90,7 @@ protected slots:
void cleanDeckAndResetModified(); void cleanDeckAndResetModified();
virtual void actLoadDeck(); virtual void actLoadDeck();
bool actSaveDeck(); bool actSaveDeck();
bool actSaveDeckAs(); virtual bool actSaveDeckAs();
virtual void actLoadDeckFromClipboard(); virtual void actLoadDeckFromClipboard();
void actEditDeckInClipboard(); void actEditDeckInClipboard();
void actEditDeckInClipboardRaw(); void actEditDeckInClipboardRaw();