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

fix remaining

Browse source
This commit is contained in:
RickyRister 2025-02-27 00:28:21 -08:00
parent 6271c941af
commit 00e99b3d39
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -292,12 +292,13 @@ void AbstractTabDeckEditor::openDeckFromFile(const QString &fileName, DeckOpenLo
SettingsCache::instance().recents().updateRecentlyOpenedDeckPaths(fileName);
if (deckOpenLocation == NEW_TAB) {
emit openDeckEditor(l);
l->deleteLater();
} else {
deckMenu->setSaveStatus(false);
setDeck(l);
}
} else {
delete l;
l->deleteLater();
QMessageBox::critical(this, tr("Error"), tr("Could not open deck at %1").arg(fileName));
}
deckMenu->setSaveStatus(true);

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

@ -63,13 +63,14 @@ void DlgLoadDeckFromClipboard::actOK()
QTextStream stream(&buffer);
auto *deckLoader = new DeckLoader;
deckLoader->setParent(this);
if (buffer.contains("<cockatrice_deck version=\"1\">")) {
if (deckLoader->loadFromString_Native(buffer)) {
deckList = deckLoader;
accept();
} else {
QMessageBox::critical(this, tr("Error"), tr("Invalid deck list."));
delete deckLoader;
}
} else if (deckLoader->loadFromStream_Plain(stream)) {
deckList = deckLoader;
@ -81,7 +82,6 @@ void DlgLoadDeckFromClipboard::actOK()
accept();
} else {
QMessageBox::critical(this, tr("Error"), tr("Invalid deck list."));
delete deckLoader;
}
}