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

Oracle: fix crash on no card type; fix #3815 (#3816)

Browse source
This commit is contained in:
ctrlaltca 2019-10-02 20:54:51 +02:00 committed by Zach H
parent 933f3e1392
commit bcf505c98b
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
oracle/src/oracleimporter.cpp
View file

@ -82,11 +82,16 @@ bool OracleImporter::readSetsFromByteArray(const QByteArray &data)
QString OracleImporter::getMainCardType(const QStringList &typeList) QString OracleImporter::getMainCardType(const QStringList &typeList)
{ {
if (typeList.isEmpty()) {
return {};
}
for (const auto &type : mainCardTypes) { for (const auto &type : mainCardTypes) {
if (typeList.contains(type)) { if (typeList.contains(type)) {
return type; return type;
} }
} }
return typeList.first(); return typeList.first();
} }
@ -291,7 +296,9 @@ int OracleImporter::importCardsFromSet(CardSetPtr currentSet, const QList<QVaria
} }
const auto &mainCardType = getMainCardType(card.value("types").toStringList()); const auto &mainCardType = getMainCardType(card.value("types").toStringList());
if (!mainCardType.isEmpty()) { if (mainCardType.isEmpty()) {
qDebug() << "warning: no mainCardType for card:" << name;
} else {
properties.insert("maintype", mainCardType); properties.insert("maintype", mainCardType);
} }