From 9c0732646266863740c2b1a12e318c950ad44c9a Mon Sep 17 00:00:00 2001
From: Mat Sutcliffe <oktal3700@gmail.com>
Date: Tue, 30 Apr 2019 01:52:49 +0100
Subject: [PATCH] Treat an OBJ8_AIRCRAFT command with too many arguments as
 merely a warning. The aircraft can still be successfully loaded.

---
 .../simulation/xplane/aircraftmodelloaderxplane.cpp        | 7 +++++--
 src/xswiftbus/libxplanemp                                  | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/blackmisc/simulation/xplane/aircraftmodelloaderxplane.cpp b/src/blackmisc/simulation/xplane/aircraftmodelloaderxplane.cpp
index 014e0bd17..027794953 100644
--- a/src/blackmisc/simulation/xplane/aircraftmodelloaderxplane.cpp
+++ b/src/blackmisc/simulation/xplane/aircraftmodelloaderxplane.cpp
@@ -499,9 +499,12 @@ namespace BlackMisc
                 // OBJ8_AIRCRAFT <path>
                 if (tokens.size() != 2)
                 {
-                    const CStatusMessage m = CStatusMessage(this).error(u"%1/xsb_aircraft.txt Line %2 : OBJ8_AIRCARFT command requires 1 argument.") << path << lineNum;
+                    const CStatusMessage m = CStatusMessage(this).warning(u"%1/xsb_aircraft.txt Line %2 : OBJ8_AIRCARFT command requires 1 argument.") << path << lineNum;
                     m_loadingMessages.push_back(m);
-                    return false;
+                    if (tokens.size() < 2)
+                    {
+                        return false;
+                    }
                 }
                 return true;
             }
diff --git a/src/xswiftbus/libxplanemp b/src/xswiftbus/libxplanemp
index c83e84730..5c9b95d05 160000
--- a/src/xswiftbus/libxplanemp
+++ b/src/xswiftbus/libxplanemp
@@ -1 +1 @@
-Subproject commit c83e847308660e0f40885d953e9e0b0e1d84ad76
+Subproject commit 5c9b95d058b464d94aeb67ed3c4b0e359d07edf1