diff --git a/src/blackcore/vatsim/networkvatlib.cpp b/src/blackcore/vatsim/networkvatlib.cpp
index b1d4b7bac..13fa5347a 100644
--- a/src/blackcore/vatsim/networkvatlib.cpp
+++ b/src/blackcore/vatsim/networkvatlib.cpp
@@ -93,7 +93,7 @@ namespace BlackCore
connect(&m_processingTimer, &QTimer::timeout, this, &CNetworkVatlib::process);
connect(&m_positionUpdateTimer, &QTimer::timeout, this, &CNetworkVatlib::sendPositionUpdate);
connect(&m_interimPositionUpdateTimer, &QTimer::timeout, this, &CNetworkVatlib::sendInterimPositions);
- connect(&this->m_scheduledConfigUpdate, &QTimer::timeout, this, &CNetworkVatlib::sendIncrementalAircraftConfig);
+ connect(&m_scheduledConfigUpdate, &QTimer::timeout, this, &CNetworkVatlib::sendIncrementalAircraftConfig);
m_scheduledConfigUpdate.setSingleShot(true);
m_processingTimer.start(c_processingIntervalMsec);
diff --git a/src/blackgui/components/maininfoareacomponent.ui b/src/blackgui/components/maininfoareacomponent.ui
index b54263601..37d577dc8 100644
--- a/src/blackgui/components/maininfoareacomponent.ui
+++ b/src/blackgui/components/maininfoareacomponent.ui
@@ -14,7 +14,7 @@
Main info area
-
+
:/own/icons/own/swift/swift24.png:/own/icons/own/swift/swift24.png
@@ -612,7 +612,7 @@
0
-
+
0
@@ -679,15 +679,6 @@
-
-
- QFrame::NoFrame
-
-
- QFrame::Plain
-
-
- 0
-
0
@@ -950,8 +941,6 @@
1
-
-
-
+
diff --git a/src/blackmisc/audio/voiceroom.cpp b/src/blackmisc/audio/voiceroom.cpp
index bd52b5529..942af16b1 100644
--- a/src/blackmisc/audio/voiceroom.cpp
+++ b/src/blackmisc/audio/voiceroom.cpp
@@ -77,7 +77,7 @@ namespace BlackMisc
{
if (!this->isValid()) return "Invalid";
QString s = this->getVoiceRoomUrl(false);
- s.append(this ->isConnected() ? " connected" : " unconnected");
+ s.append(this->isConnected() ? " connected" : " unconnected");
if (this->m_audioPlaying) s.append(" playing");
return s;
}
diff --git a/src/plugins/simulator/fsx/simulatorfsxsimconnectproc.cpp b/src/plugins/simulator/fsx/simulatorfsxsimconnectproc.cpp
index 7db35059b..03399552c 100644
--- a/src/plugins/simulator/fsx/simulatorfsxsimconnectproc.cpp
+++ b/src/plugins/simulator/fsx/simulatorfsxsimconnectproc.cpp
@@ -136,7 +136,7 @@ namespace BlackSimPlugin
}
case SIMCONNECT_RECV_ID_EVENT_FRAME:
{
- SIMCONNECT_RECV_EVENT_FRAME *event = (SIMCONNECT_RECV_EVENT_FRAME *) pData;
+ SIMCONNECT_RECV_EVENT_FRAME *event = (SIMCONNECT_RECV_EVENT_FRAME *) pData;
switch (event->uEventID)
{
case SystemEventFrame:
diff --git a/src/swiftdata/swiftdata.cpp b/src/swiftdata/swiftdata.cpp
index 3efffd94f..4bd9724d7 100644
--- a/src/swiftdata/swiftdata.cpp
+++ b/src/swiftdata/swiftdata.cpp
@@ -70,6 +70,7 @@ void CSwiftData::closeEvent(QCloseEvent *event)
void CSwiftData::ps_appendLogMessage(const CStatusMessage &message)
{
+ if (!ui->comp_MainInfoArea) { return; } // not initialized yet
CLogComponent *logComponent = ui->comp_MainInfoArea->getLogComponent();
Q_ASSERT_X(logComponent, Q_FUNC_INFO, "missing log component");
logComponent->appendStatusMessageToList(message);