aly/servatrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #1221 from Fizztastic/fix_818

Browse source 
Load .cod files from clipboard in deck editor
This commit is contained in:
Zach 2015-07-07 00:36:49 -04:00
commit 2b484aa9ee
1 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
cockatrice/src/dlg_load_deck_from_clipboard.cpp
View file

@ -48,7 +48,20 @@ void DlgLoadDeckFromClipboard::actOK()
QTextStream stream(&buffer);
DeckLoader *l = new DeckLoader;
if (l->loadFromStream_Plain(stream)) {
if (buffer.contains("<cockatrice_deck version=\"1\">"))
{
if (l->loadFromString_Native(buffer))
{
deckList = l;
accept();
}
else
{
QMessageBox::critical(this, tr("Error"), tr("Invalid deck list."));
delete l;
}
}
else if (l->loadFromStream_Plain(stream)) {
deckList = l;
accept();
} else {