From 34f3de0dfb9ae025f201018392ca9e4888268d3a Mon Sep 17 00:00:00 2001
From: Klaus Basan <klaus.basan@klausbasan.de>
Date: Tue, 31 Jan 2017 05:00:28 +0100
Subject: [PATCH] Fixed missing info of own aircraft

---
 src/blackgui/components/logincomponent.cpp | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/blackgui/components/logincomponent.cpp b/src/blackgui/components/logincomponent.cpp
index 669f5ff64..252360b02 100644
--- a/src/blackgui/components/logincomponent.cpp
+++ b/src/blackgui/components/logincomponent.cpp
@@ -47,6 +47,7 @@
 #include <QToolButton>
 #include <QCompleter>
 #include <QStyledItemDelegate>
+#include <QStringBuilder>
 #include <QtGlobal>
 
 using namespace BlackConfig;
@@ -275,6 +276,9 @@ namespace BlackGui
                 ui->frp_CurrentServer->setServer(currentServer);
                 sGui->getIContextOwnAircraft()->updateOwnAircraftPilot(currentServer.getUser());
 
+                // set own aircraft from all values
+                ownAircraft = sGui->getIContextOwnAircraft()->getOwnAircraft();
+
                 // Login
                 msg = sGui->getIContextNetwork()->connectToNetwork(currentServer, mode);
                 if (msg.isSuccess() && vatsimLogin)
@@ -296,9 +300,9 @@ namespace BlackGui
             CLogMessage::preformatted(msg);
             if (msg.isSuccess())
             {
-                QString ac(ownAircraft.getCallsignAsString() + " " + ownAircraft.getAircraftIcaoCodeDesignator());
-                if (ownAircraft.hasAirlineDesignator()) { ac += " "; ac += ownAircraft.getAirlineIcaoCodeDesignator(); }
-                if (!ownAircraft.getAircraftIcaoCombinedType().isEmpty()) { ac += " "; ac += ownAircraft.getAircraftIcaoCode().getCombinedType(); }
+                QString ac(ownAircraft.getCallsignAsString() % QLatin1Char(' ') % ownAircraft.getAircraftIcaoCodeDesignator());
+                if (ownAircraft.hasAirlineDesignator()) { ac += QLatin1Char(' ') % ownAircraft.getAirlineIcaoCodeDesignator(); }
+                if (!ownAircraft.getAircraftIcaoCombinedType().isEmpty()) { ac += QLatin1Char(' ') % ownAircraft.getAircraftIcaoCode().getCombinedType(); }
                 ui->le_LoginSince->setText(QDateTime::currentDateTimeUtc().toString());
                 ui->le_LoginAsAircaft->setText(ac);
                 emit this->loginOrLogoffSuccessful();