flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-19 20:25:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

Emulated driver: Use QPointer for widget as the widget can be deleted elsewhere as well

Browse Source
This commit is contained in:
Klaus Basan
2020-02-29 03:07:48 +01:00
committed by Mat Sutcliffe
parent 3ffedd16ec
commit b1d1880d43
2 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugins/simulator/emulated/simulatoremulated.cpp
View File

@@ -48,7 +48,7 @@ namespace BlackSimPlugin
this->onSettingsChanged(); // init from settings this->onSettingsChanged(); // init from settings
m_myAircraft = this->getOwnAircraft(); // sync with provider m_myAircraft = this->getOwnAircraft(); // sync with provider
m_monitorWidget.reset(new CSimulatorEmulatedMonitorDialog(this, sGui->mainApplicationWidget())); m_monitorWidget = new CSimulatorEmulatedMonitorDialog(this, sGui->mainApplicationWidget());
connect(qApp, &QApplication::aboutToQuit, this, &CSimulatorEmulated::closeMonitor); connect(qApp, &QApplication::aboutToQuit, this, &CSimulatorEmulated::closeMonitor);
connect(sGui, &CGuiApplication::aboutToShutdown, this, &CSimulatorEmulated::closeMonitor, Qt::QueuedConnection); connect(sGui, &CGuiApplication::aboutToShutdown, this, &CSimulatorEmulated::closeMonitor, Qt::QueuedConnection);
@@ -58,6 +58,17 @@ namespace BlackSimPlugin
this->connectOwnSignals(); this->connectOwnSignals();
} }
CSimulatorEmulated::~CSimulatorEmulated()
{
if (m_monitorWidget)
{
// if the widget still exists, close and delete it
m_monitorWidget->close();
m_monitorWidget->deleteLater();
m_monitorWidget.clear();
}
}
bool CSimulatorEmulated::isTimeSynchronized() const bool CSimulatorEmulated::isTimeSynchronized() const
{ {
return m_timeSyncronized; return m_timeSyncronized;

7
src/plugins/simulator/emulated/simulatoremulated.h
View File

@@ -24,7 +24,7 @@
#include <QMap> #include <QMap>
#include <QTimer> #include <QTimer>
#include <QScopedPointer> #include <QPointer>
namespace BlackSimPlugin namespace BlackSimPlugin
{ {
@@ -50,6 +50,9 @@ namespace BlackSimPlugin
BlackMisc::Network::IClientProvider *clientProvider, BlackMisc::Network::IClientProvider *clientProvider,
QObject *parent = nullptr); QObject *parent = nullptr);
//! Destructor
virtual ~CSimulatorEmulated() override;
// functions implemented // functions implemented
virtual bool isTimeSynchronized() const override; virtual bool isTimeSynchronized() const override;
virtual bool connectTo() override; virtual bool connectTo() override;
@@ -177,7 +180,7 @@ namespace BlackSimPlugin
BlackMisc::PhysicalQuantities::CTime m_offsetTime; BlackMisc::PhysicalQuantities::CTime m_offsetTime;
BlackMisc::Simulation::CSimulatedAircraft m_myAircraft; //!< represents own aircraft of simulator BlackMisc::Simulation::CSimulatedAircraft m_myAircraft; //!< represents own aircraft of simulator
BlackMisc::Simulation::CSimulatedAircraftList m_renderedAircraft; //!< represents remote aircraft in simulator BlackMisc::Simulation::CSimulatedAircraftList m_renderedAircraft; //!< represents remote aircraft in simulator
QScopedPointer<CSimulatorEmulatedMonitorDialog> m_monitorWidget; //!< parent will be main window, so we need to destroy widget when destroyed QPointer<CSimulatorEmulatedMonitorDialog> m_monitorWidget; //!< parent will be main window, so we need to destroy widget when destroyed
BlackMisc::CConnectionGuard m_connectionGuard; //!< connected with provider BlackMisc::CConnectionGuard m_connectionGuard; //!< connected with provider
BlackMisc::CSettingReadOnly<BlackMisc::Simulation::Settings::TSwiftPlugin> m_pluginSettings { this, &CSimulatorEmulated::onSettingsChanged }; BlackMisc::CSettingReadOnly<BlackMisc::Simulation::Settings::TSwiftPlugin> m_pluginSettings { this, &CSimulatorEmulated::onSettingsChanged };
QMap<BlackMisc::Aviation::CCallsign, BlackMisc::Simulation::CInterpolatorMultiWrapper> m_interpolators; //!< interpolators per callsign QMap<BlackMisc::Aviation::CCallsign, BlackMisc::Simulation::CInterpolatorMultiWrapper> m_interpolators; //!< interpolators per callsign