From a924b5e78bbc5b4083ab0207d36a95f7b299fb15 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Sat, 21 Dec 2019 19:45:06 +0100 Subject: [PATCH] Improved (error) message if owner is empty --- src/plugins/simulator/flightgear/simulatorflightgear.cpp | 7 ++++--- src/plugins/simulator/xplane/simulatorxplane.cpp | 3 ++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/plugins/simulator/flightgear/simulatorflightgear.cpp b/src/plugins/simulator/flightgear/simulatorflightgear.cpp index 21537d650..ecd6e930d 100644 --- a/src/plugins/simulator/flightgear/simulatorflightgear.cpp +++ b/src/plugins/simulator/flightgear/simulatorflightgear.cpp @@ -1039,10 +1039,11 @@ namespace BlackSimPlugin return; } - MultiplayerAcquireInfo info = traffic.acquireMultiplayerPlanes(); - if (! info.hasAcquired) + const MultiplayerAcquireInfo info = traffic.acquireMultiplayerPlanes(); + if (!info.hasAcquired) { - CLogMessage(this).error(u"Connection to FGSwiftBus successful, but could not acquire multiplayer planes. %1 has acquired them already. Disable %2 or remove it if not required and reload FGSwiftBus.") << info.owner << info.owner; + const QString owner = info.owner.trimmed().isEmpty() ? QStringLiteral("Some/this plugin/application") : info.owner.trimmed(); + CLogMessage(this).error(u"Connection to FGSwiftBus successful, but could not acquire multiplayer planes. '%1' has acquired them already. Disable '%2' or remove it if not required and reload FGSwiftBus.") << owner << owner.toLower(); return; } diff --git a/src/plugins/simulator/xplane/simulatorxplane.cpp b/src/plugins/simulator/xplane/simulatorxplane.cpp index 2336486f0..8f451b9bf 100644 --- a/src/plugins/simulator/xplane/simulatorxplane.cpp +++ b/src/plugins/simulator/xplane/simulatorxplane.cpp @@ -1380,7 +1380,8 @@ namespace BlackSimPlugin const MultiplayerAcquireInfo info = traffic.acquireMultiplayerPlanes(); if (!info.hasAcquired) { - CLogMessage(this).error(u"Connection to XSwiftBus successful, but could not acquire multiplayer planes. %1 has acquired them already. Disable %2 or remove it if not required and reload XSwiftBus.") << info.owner << info.owner; + const QString owner = info.owner.trimmed().isEmpty() ? QStringLiteral("Some/this plugin/application") : info.owner.trimmed(); + CLogMessage(this).error(u"Connection to XSwiftBus successful, but could not acquire multiplayer planes. '%1' has acquired them already. Disable '%2' or remove it if not required and reload XSwiftBus.") << owner << owner.toLower(); return; }