Removed outdated sender check, adjusted time

This commit is contained in:
Klaus Basan
2015-05-21 02:24:34 +02:00
parent 880a954db9
commit 6bb3e7f753
2 changed files with 5 additions and 9 deletions

View File

@@ -295,15 +295,11 @@ void SwiftGuiStd::ps_onConnectionStatusChanged(int from, int to)
void SwiftGuiStd::ps_handleTimerBasedUpdates() void SwiftGuiStd::ps_handleTimerBasedUpdates()
{ {
QObject *sender = QObject::sender(); this->setContextAvailability();
if (sender == this->m_timerContextWatchdog) this->updateGuiStatusInformation();
{
this->setContextAvailability();
this->updateGuiStatusInformation();
}
// own aircraft // own aircraft
this->ps_reloadOwnAircraft(); // regular updates this->ps_reloadOwnAircraft();
} }
void SwiftGuiStd::setContextAvailability() void SwiftGuiStd::setContextAvailability()

View File

@@ -105,14 +105,14 @@ void SwiftGuiStd::init(const CRuntimeConfig &runtimeConfig)
connect(this->getIContextNetwork(), &IContextNetwork::connectionStatusChanged, this, &SwiftGuiStd::ps_onConnectionStatusChanged); connect(this->getIContextNetwork(), &IContextNetwork::connectionStatusChanged, this, &SwiftGuiStd::ps_onConnectionStatusChanged);
connect(this->getIContextNetwork(), &IContextNetwork::textMessagesReceived, this->ui->comp_MainInfoArea->getTextMessageComponent(), &CTextMessageComponent::onTextMessageReceived); connect(this->getIContextNetwork(), &IContextNetwork::textMessagesReceived, this->ui->comp_MainInfoArea->getTextMessageComponent(), &CTextMessageComponent::onTextMessageReceived);
connect(this->getIContextNetwork(), &IContextNetwork::textMessageSent, this->ui->comp_MainInfoArea->getTextMessageComponent(), &CTextMessageComponent::onTextMessageSent); connect(this->getIContextNetwork(), &IContextNetwork::textMessageSent, this->ui->comp_MainInfoArea->getTextMessageComponent(), &CTextMessageComponent::onTextMessageSent);
connect(this->m_timerContextWatchdog, &QTimer::timeout, this, &SwiftGuiStd::ps_handleTimerBasedUpdates);
connect(this->getIContextSettings(), &IContextSettings::changedSettings, this, &SwiftGuiStd::ps_onChangedSetttings); connect(this->getIContextSettings(), &IContextSettings::changedSettings, this, &SwiftGuiStd::ps_onChangedSetttings);
connect(this->m_timerContextWatchdog, &QTimer::timeout, this, &SwiftGuiStd::ps_handleTimerBasedUpdates);
// log messages // log messages
m_logSubscriber.changeSubscription(CLogPattern().withSeverityAtOrAbove(CStatusMessage::SeverityInfo)); m_logSubscriber.changeSubscription(CLogPattern().withSeverityAtOrAbove(CStatusMessage::SeverityInfo));
// start timers, update timers will be started when network is connected // start timers, update timers will be started when network is connected
this->m_timerContextWatchdog->start(2 * 1000); this->m_timerContextWatchdog->start(2500);
// init availability // init availability
this->setContextAvailability(); this->setContextAvailability();