diff --git a/oracle/src/oracleimporter.cpp b/oracle/src/oracleimporter.cpp index b8cb05376..898adf9aa 100644 --- a/oracle/src/oracleimporter.cpp +++ b/oracle/src/oracleimporter.cpp @@ -389,8 +389,6 @@ void OracleImporter::sortAndReduceColors(QString &colors) int OracleImporter::startImport() { - clear(); - int setCards = 0, setIndex = 0; // add an empty set for 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; return parser.saveToFile(sets, cards, fileName); } + +void OracleImporter::clear() +{ + CardDatabase::clear(); + allSets.clear(); +} diff --git a/oracle/src/oracleimporter.h b/oracle/src/oracleimporter.h index 133ed72b8..ba6e87958 100644 --- a/oracle/src/oracleimporter.h +++ b/oracle/src/oracleimporter.h @@ -120,6 +120,7 @@ public: { return dataDir; } + void clear(); protected: inline QString getStringPropertyFromMap(QVariantMap card, QString propertyName); diff --git a/oracle/src/oraclewizard.cpp b/oracle/src/oraclewizard.cpp index 1f8744165..3d7a48800 100644 --- a/oracle/src/oraclewizard.cpp +++ b/oracle/src/oraclewizard.cpp @@ -530,6 +530,7 @@ SaveSetsPage::SaveSetsPage(QWidget *parent) : OracleWizardPage(parent) void SaveSetsPage::cleanupPage() { + wizard()->importer->clear(); disconnect(wizard()->importer, SIGNAL(setIndexChanged(int, int, const QString &)), nullptr, nullptr); }