flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-02 06:35:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Check if SimConnect was properly loaded before attempting to use it

Browse Source 
This commit adds a check that loadAndResolveSimConnect actually succeeds and
moves it right before SimConnect_Open is called.
The method itself was improved to check whether symbols got loaded already
in a previous run, before doing everything again.
This commit is contained in:
Roland Winklmeier
2018-08-13 17:46:28 +02:00
committed by Klaus Basan
parent f3024d15cb
commit ce99c0535f
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/simulator/fsxcommon/simulatorfsxcommon.cpp
View File

@@ -87,6 +87,9 @@ namespace BlackSimPlugin
{
if (this->isConnected()) { return true; }
this->reset();
if (!loadAndResolveSimConnect(true)) { return false; }
if (FAILED(SimConnect_Open(&m_hSimConnect, sApp->swiftVersionChar(), nullptr, 0, 0, 0)))
{
// reset state as expected for unconnected
@@ -2017,7 +2020,6 @@ namespace BlackSimPlugin
constexpr int QueryInterval = 5 * 1000; // 5 seconds
m_timer.setInterval(QueryInterval);
m_timer.setObjectName(this->objectName().append(":m_timer"));
loadAndResolveSimConnect(true);
connect(&m_timer, &QTimer::timeout, this, &CSimulatorFsxCommonListener::checkConnection);
}
@@ -2027,6 +2029,9 @@ namespace BlackSimPlugin
m_simConnectVersion.clear();
m_simulatorName.clear();
m_simulatorDetails.clear();
if (!loadAndResolveSimConnect(true)) { return; }
m_timer.start();
}