diff --git a/src/blackgui/components/infobarstatuscomponent.cpp b/src/blackgui/components/infobarstatuscomponent.cpp
index 4ab768d11..9b11c2ded 100644
--- a/src/blackgui/components/infobarstatuscomponent.cpp
+++ b/src/blackgui/components/infobarstatuscomponent.cpp
@@ -105,7 +105,7 @@ namespace BlackGui
{
if (status > 0 && (status & ISimulator::Connected))
{
- QString s(
+ const QString s(
sGui->getIContextSimulator()->getSimulatorPluginInfo().getDescription() + ": " +
ISimulator::statusToString(status));
@@ -131,6 +131,9 @@ namespace BlackGui
{
ui->led_Simulator->setOn(false);
}
+
+ // simulator status has impact on model set available
+ this->ps_onMapperReady();
}
void CInfoBarStatusComponent::ps_onNetworkConnectionChanged(BlackCore::INetwork::ConnectionStatus from, BlackCore::INetwork::ConnectionStatus to)
@@ -195,14 +198,14 @@ namespace BlackGui
void CInfoBarStatusComponent::ps_onMapperReady()
{
- if (!sGui->getIContextSimulator())
+ if (!sGui || !sGui->getIContextSimulator())
{
ui->led_MapperReady->setOn(false);
return;
}
- int models = sGui->getIContextSimulator()->getModelSetCount();
- bool on = (models > 0);
+ const int models = sGui->getIContextSimulator()->getModelSetCount();
+ const bool on = (models > 0);
ui->led_MapperReady->setOn(on);
if (on)
{
diff --git a/src/blackgui/components/infobarstatuscomponent.ui b/src/blackgui/components/infobarstatuscomponent.ui
index 208f23587..77573ab03 100644
--- a/src/blackgui/components/infobarstatuscomponent.ui
+++ b/src/blackgui/components/infobarstatuscomponent.ui
@@ -6,7 +6,7 @@
0
0
- 184
+ 191
20
@@ -19,19 +19,6 @@
Info status bar
-
-
- :/own/icons/own/swift/swift24.png:/own/icons/own/swift/swift24.png
-
-
- QFrame::NoFrame
-
-
- QFrame::Plain
-
-
- 0
-
0
@@ -50,12 +37,6 @@
-
-
-
- 0
- 0
-
-
Network
@@ -82,7 +63,7 @@
sim
- 6
+ 4
@@ -105,7 +86,7 @@
map
- 6
+ 4
@@ -121,10 +102,10 @@
- DB
+ DBus
- 6
+ 4
@@ -153,7 +134,7 @@
ptt
- 6
+ 4
@@ -165,14 +146,11 @@
Audio
-
- 0
-
- au.
+ au
- 6
+ 4
@@ -189,8 +167,6 @@
1
-
-
-
+