diff --git a/src/plugins/simulator/fs9/simulatorfs9.cpp b/src/plugins/simulator/fs9/simulatorfs9.cpp index 7e6e0f76f..435f2c4c3 100644 --- a/src/plugins/simulator/fs9/simulatorfs9.cpp +++ b/src/plugins/simulator/fs9/simulatorfs9.cpp @@ -356,6 +356,7 @@ namespace BlackSimPlugin simDataOwnAircraft.getCom2System(), simDataOwnAircraft.getTransponder(), this->identifier()); + reverseLookupAndUpdateOwnAircraftModel(simDataOwnAircraft.getModelString()); } void CSimulatorFs9::disconnectAllClients() diff --git a/src/plugins/simulator/fscommon/fsuipc.cpp b/src/plugins/simulator/fscommon/fsuipc.cpp index 48e9c7da1..487ee97c2 100644 --- a/src/plugins/simulator/fscommon/fsuipc.cpp +++ b/src/plugins/simulator/fscommon/fsuipc.cpp @@ -283,7 +283,7 @@ namespace BlackSimPlugin (situationN || FSUIPC_Read(0x0020, 4, &groundAltitudeRaw, &dwResult)) && // model name - (aircraftPartsN || FSUIPC_Read(0x3d00, 256, &modelNameRaw, &dwResult)) && + FSUIPC_Read(0x3d00, 256, &modelNameRaw, &dwResult) && // aircraft parts (aircraftPartsN || FSUIPC_Read(0x0D0C, 2, &lightsRaw, &dwResult)) && @@ -381,13 +381,12 @@ namespace BlackSimPlugin } // situation + // model + const QString modelName = QString(modelNameRaw); // to be used to distinguish offsets for different models + aircraft.setModelString(modelName); + if (aircraftParts) { - - // model - const QString modelName = QString(modelNameRaw); // to be used to distinguish offsets for different models - aircraft.setModelString(modelName); - CAircraftLights lights(lightsRaw & (1 << 4), lightsRaw & (1 << 2), lightsRaw & (1 << 3), lightsRaw & (1 << 1), lightsRaw & (1 << 0), lightsRaw & (1 << 8));