flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-05-03 16:25:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ref T180, do not disconnect from dispatch (SimConnectProc) function

Browse Source 
This causes a crash in P3Dv4 and has been wrong all the time because it closes itself from within the dispatcher
This commit is contained in:
Klaus Basan
2017-11-02 20:06:10 +01:00
parent 20316fd77d
commit 1018d06f70
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -342,7 +342,10 @@ namespace BlackSimPlugin
{ {
// reset complete state, we are going down // reset complete state, we are going down
m_simulatingChangedTs = QDateTime::currentMSecsSinceEpoch(); m_simulatingChangedTs = QDateTime::currentMSecsSinceEpoch();
disconnectFrom(); if (m_simConnectTimerId >= 0) { killTimer(m_simConnectTimerId); }
// if called from dispatch function, avoid that SimConnectProc disconnects itself while in SimConnectProc
QTimer::singleShot(0, this, &CSimulatorFsxCommon::disconnectFrom);
} }
DWORD CSimulatorFsxCommon::obtainRequestIdSimData() DWORD CSimulatorFsxCommon::obtainRequestIdSimData()
@@ -761,11 +764,12 @@ namespace BlackSimPlugin
{ {
// 2nd time, an error / avoid multiple messages // 2nd time, an error / avoid multiple messages
// idea: if it happens once ignore // idea: if it happens once ignore
CLogMessage(this).error("FSX: Dispatch error"); CLogMessage(this).error("FSX/P3D: Dispatch error");
} }
else if (m_dispatchErrors > 5) else if (m_dispatchErrors > 5)
{ {
// this normally happens during a FSX crash or shutdown // this normally happens during a FSX crash or shutdown
CLogMessage(this).error("FSX/P3D: Multiple dispatch errors, disconnecting");
this->disconnectFrom(); this->disconnectFrom();
} }
return; return;