flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-31 21:15:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #431, infinite recursion in driver unload

Browse Source 
* Trivial changes to avoid changedStatus signal when nothing changed
* Do not reload plugin when already loaded
This commit is contained in:
Klaus Basan
2015-05-28 20:13:03 +02:00
parent eb8b6e6f1f
commit 94eb33d228
7 changed files with 45 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/simulator/fs9/simulator_fs9.cpp
View File

@@ -96,7 +96,7 @@ namespace BlackSimPlugin
bool CSimulatorFs9::disconnectFrom()
{
if (!m_simConnected) return true;
if (!m_simConnected) { return true; }
// Don't forward messages when disconnected
disconnect(m_connectionHostMessages);

8
src/plugins/simulator/fsx/simulator_fsx.cpp
View File

@@ -80,12 +80,13 @@ namespace BlackSimPlugin
bool CSimulatorFsx::connectTo()
{
if (m_simConnected) { return true; }
int oldStatus = getSimulatorStatus();
if (FAILED(SimConnect_Open(&m_hSimConnect, BlackMisc::CProject::systemNameAndVersionChar(), nullptr, 0, 0, 0)))
{
m_simConnected = false;
m_simPaused = false;
m_simSimulating = false;
emitSimulatorCombinedStatus();
emitSimulatorCombinedStatus(oldStatus);
return false;
}
else
@@ -96,7 +97,7 @@ namespace BlackSimPlugin
initWhenConnected();
m_simconnectTimerId = startTimer(10);
m_simConnected = true;
emitSimulatorCombinedStatus();
emitSimulatorCombinedStatus(oldStatus);
return true;
}
@@ -352,8 +353,9 @@ namespace BlackSimPlugin
void CSimulatorFsx::onSimStopped()
{
int oldStatus = getSimulatorStatus();
m_simSimulating = false;
emitSimulatorCombinedStatus();
emitSimulatorCombinedStatus(oldStatus);
}
void CSimulatorFsx::onSimFrame()

7
src/plugins/simulator/fsx/simulator_fsx_simconnectproc.cpp
View File

@@ -84,8 +84,11 @@ namespace BlackSimPlugin
case SystemEventPause:
{
bool p = event->dwData ? true : false;
simulatorFsx->m_simPaused = p;
simulatorFsx->emitSimulatorCombinedStatus();
if (simulatorFsx->m_simPaused != p)
{
simulatorFsx->m_simPaused = p;
simulatorFsx->emitSimulatorCombinedStatus();
}
break;
}
default:

1
src/plugins/simulator/xplane/simulator_xplane.cpp
View File

@@ -193,6 +193,7 @@ namespace BlackSimPlugin
bool CSimulatorXPlane::disconnectFrom()
{
if (!this->isConnected()) { return true; } // avoid emit if already disconnected
if (m_traffic)
{
m_traffic->cleanup();