Fixes: emit signals at end and check sGui

This commit is contained in:
Klaus Basan
2018-06-27 01:44:29 +02:00
parent b551aaf874
commit 7e8c0cc99d
2 changed files with 17 additions and 9 deletions

View File

@@ -52,14 +52,20 @@ namespace BlackGui
void CModelMatcherLogComponent::initGui()
{
// avoid signal roundtrip
bool c = sGui->getIContextNetwork()->isReverseLookupMessagesEnabled();
ui->cb_LogReverseLookup->setChecked(c);
if (sGui)
{
// avoid signal roundtrips
bool c = sGui->getIContextNetwork()->isReverseLookupMessagesEnabled();
if (c != ui->cb_LogReverseLookup->isChecked())
{
ui->cb_LogReverseLookup->setChecked(c);
}
c = sGui->getIContextSimulator()->isMatchingMessagesEnabled();
ui->cb_LogMatchingMessages->setChecked(c);
if (c != ui->cb_LogMatchingMessages->isChecked())
{
ui->cb_LogMatchingMessages->setChecked(c);
}
}
}

View File

@@ -152,10 +152,7 @@ namespace BlackMisc
void CRemoteAircraftProvider::removeAllAircraft()
{
for (const CCallsign &cs : this->getAircraftInRangeCallsigns())
{
emit this->removedAircraft(cs);
}
const CCallsignSet callsigns = this->getAircraftInRangeCallsigns();
// locked members
{
@@ -182,6 +179,11 @@ namespace BlackMisc
{ QWriteLocker l(&m_lockPartsHistory); m_aircraftPartsMessages.clear(); }
{ QWriteLocker l(&m_lockMessages); m_reverseLookupMessages.clear(); }
{ QWriteLocker l(&m_lockAircraft); m_aircraftInRange.clear(); }
for (const CCallsign &cs : callsigns)
{
emit this->removedAircraft(cs);
}
}
void CRemoteAircraftProvider::removeReverseLookupMessages(const CCallsign &callsign)