refs #438, allow to cancel parser

* added flag for parsing success
* unload driver cancels parsing
* assert for invoke
* using waitForFinished
This commit is contained in:
Klaus Basan
2015-06-02 00:15:20 +02:00
parent a6dd7fdd09
commit 8e56a14caf
7 changed files with 73 additions and 51 deletions

View File

@@ -51,7 +51,7 @@ namespace BlackMisc
void CAircraftMatcher::setModelMappingProvider(std::unique_ptr<IModelMappingsProvider> mappings)
{
m_mappingsProvider = std::move(mappings);
if (m_matchingMode.testFlag(ModelMapping)) initMappings();
if (m_matchingMode.testFlag(ModelMapping)) { initMappings(); }
}
void CAircraftMatcher::setMatchingModes(MatchingMode matchingModes)
@@ -157,9 +157,9 @@ namespace BlackMisc
// finish
CLogMessage(this).info("Mapping system: %1 definitions for %2 installed models") << m_modelMappings.size()
<< m_installedModels.size();
emit initializationFinished();
m_initInProgress = false;
m_initialized = true;
emit initializationFinished();
}
void CAircraftMatcher::initMappings()