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

fix #2786 (#3747)

Browse source
This commit is contained in:
ctrlaltca 2019-06-08 10:15:33 +02:00 committed by GitHub
parent 1288795de9
commit 36ba9c2d94
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
oracle/src/oracleimporter.cpp
View file

@ -389,8 +389,6 @@ void OracleImporter::sortAndReduceColors(QString &colors)
int OracleImporter::startImport() int OracleImporter::startImport()
{ {
clear();
int setCards = 0, setIndex = 0; int setCards = 0, setIndex = 0;
// add an empty set for tokens // add an empty set for tokens
CardSetPtr tokenSet = CardSet::newInstance(TOKENS_SETNAME, tr("Dummy set containing tokens"), "Tokens"); CardSetPtr tokenSet = CardSet::newInstance(TOKENS_SETNAME, tr("Dummy set containing tokens"), "Tokens");
@ -420,3 +418,9 @@ bool OracleImporter::saveToFile(const QString &fileName)
CockatriceXml4Parser parser; CockatriceXml4Parser parser;
return parser.saveToFile(sets, cards, fileName); return parser.saveToFile(sets, cards, fileName);
} }
void OracleImporter::clear()
{
CardDatabase::clear();
allSets.clear();
}

1
oracle/src/oracleimporter.h
View file

@ -120,6 +120,7 @@ public:
{ {
return dataDir; return dataDir;
} }
void clear();
protected: protected:
inline QString getStringPropertyFromMap(QVariantMap card, QString propertyName); inline QString getStringPropertyFromMap(QVariantMap card, QString propertyName);

1
oracle/src/oraclewizard.cpp
View file

@ -530,6 +530,7 @@ SaveSetsPage::SaveSetsPage(QWidget *parent) : OracleWizardPage(parent)
void SaveSetsPage::cleanupPage() void SaveSetsPage::cleanupPage()
{ {
wizard()->importer->clear();
disconnect(wizard()->importer, SIGNAL(setIndexChanged(int, int, const QString &)), nullptr, nullptr); disconnect(wizard()->importer, SIGNAL(setIndexChanged(int, int, const QString &)), nullptr, nullptr);
} }