diff --git a/src/blackcore/simulatorcommon.h b/src/blackcore/simulatorcommon.h index b2f0abbc9..1c1572375 100644 --- a/src/blackcore/simulatorcommon.h +++ b/src/blackcore/simulatorcommon.h @@ -189,18 +189,18 @@ namespace BlackCore //! Parse driver specific details for ISimulator::parseCommandLine virtual bool parseDetails(const BlackMisc::CSimpleCommandParser &parser); - bool m_pausedSimFreezesInterpolation = false; //!< paused simulator will also pause interpolation (so AI aircraft will hold) - BlackMisc::Simulation::CAircraftModel m_defaultModel; //!< default model - qint64 m_statsUpdateAircraftTimeTotalMs = 0; //!< statistics update time - qint64 m_statsUpdateAircraftTimeAvgMs = 0; //!< statistics update time - int m_statsUpdateAircraftCountMs = 0; //!< statistics update time - BlackMisc::Simulation::CSimulatorInternals m_simulatorInternals; //!< setup object - BlackMisc::Simulation::CInterpolationAndRenderingSetup m_interpolationRenderingSetup; //!< logging, rendering etc. - mutable QReadWriteLock m_interpolationRenderingSetupMutex; //!< mutex protecting setup object + bool m_pausedSimFreezesInterpolation = false; //!< paused simulator will also pause interpolation (so AI aircraft will hold) + BlackMisc::Simulation::CAircraftModel m_defaultModel; //!< default model + int m_statsUpdateAircraftCountMs = 0; //!< statistics update count + qint64 m_statsUpdateAircraftTimeTotalMs = 0; //!< statistics update time + qint64 m_statsUpdateAircraftTimeAvgMs = 0; //!< statistics update time + BlackMisc::Simulation::CSimulatorInternals m_simulatorInternals; //!< setup object BlackMisc::Simulation::CInterpolationLogger m_interpolationLogger; //!< log interpolation + BlackMisc::Simulation::CInterpolationAndRenderingSetup m_interpolationRenderingSetup; //!< logging, rendering etc. + mutable QReadWriteLock m_interpolationRenderingSetupMutex; //!< mutex protecting setup object // some optional functionality which can be used by the sims as needed - BlackMisc::Simulation::CSimulatedAircraftList m_aircraftToAddAgainWhenRemoved; //!< add this model again when removed, normally used to change model + BlackMisc::Simulation::CSimulatedAircraftList m_aircraftToAddAgainWhenRemoved; //!< add this model again when removed, normally used to change model QHash m_hints; //!< last ground elevation fetched bool m_isWeatherActivated = false; //!< Is simulator weather activated? diff --git a/src/plugins/simulator/fsxcommon/simulatorfsxsimconnectproc.cpp b/src/plugins/simulator/fsxcommon/simulatorfsxsimconnectproc.cpp index 46b449a12..29d693656 100644 --- a/src/plugins/simulator/fsxcommon/simulatorfsxsimconnectproc.cpp +++ b/src/plugins/simulator/fsxcommon/simulatorfsxsimconnectproc.cpp @@ -42,8 +42,8 @@ namespace BlackSimPlugin simulatorFsx->m_simulatorVersion = QString("%1.%2.%3.%4").arg(event->dwApplicationVersionMajor).arg(event->dwApplicationVersionMinor).arg(event->dwApplicationBuildMajor).arg(event->dwApplicationBuildMinor); simulatorFsx->m_simConnectVersion = QString("%1.%2.%3.%4").arg(event->dwSimConnectVersionMajor).arg(event->dwSimConnectVersionMinor).arg(event->dwSimConnectBuildMajor).arg(event->dwSimConnectBuildMinor); simulatorFsx->m_simulatorName = QString(event->szApplicationName); - simulatorFsx->m_simulatorDetails = QString("Open: AppName=\"%1\" AppVersion=%2 SimConnectVersion=%3").arg(simulatorFsx->m_simulatorName, simulatorFsx->m_simulatorVersion, simulatorFsx->m_simConnectVersion); - CLogMessage(static_cast(nullptr)).info("Connect to FSX/P3D: %1") << sApp->swiftVersionString(); + simulatorFsx->m_simulatorDetails = QString("Name: '%1' Version: %2 SimConnect: %3").arg(simulatorFsx->m_simulatorName, simulatorFsx->m_simulatorVersion, simulatorFsx->m_simConnectVersion); + CLogMessage(static_cast(nullptr)).info("Connect to FSX/P3D: '%1'") << simulatorFsx->m_simulatorDetails; simulatorFsx->setSimConnected(); break; }