diff --git a/src/plugins/simulator/fs9/simulator_fs9.cpp b/src/plugins/simulator/fs9/simulator_fs9.cpp index 43501aa9f..22caaeab6 100644 --- a/src/plugins/simulator/fs9/simulator_fs9.cpp +++ b/src/plugins/simulator/fs9/simulator_fs9.cpp @@ -88,12 +88,6 @@ namespace BlackSimPlugin return true; } - void CSimulatorFs9::asyncConnectTo() - { - // Since we are running the host in its own thread, it is async anyway - connectTo(); - } - bool CSimulatorFs9::disconnectFrom() { if (!m_simConnected) { return true; } diff --git a/src/plugins/simulator/fs9/simulator_fs9.h b/src/plugins/simulator/fs9/simulator_fs9.h index 71e73ea8c..9a58c6f7a 100644 --- a/src/plugins/simulator/fs9/simulator_fs9.h +++ b/src/plugins/simulator/fs9/simulator_fs9.h @@ -52,9 +52,6 @@ namespace BlackSimPlugin //! \copydoc ISimulator::connectTo() virtual bool connectTo() override; - //! \copydoc ISimulator::connectTo() - virtual void asyncConnectTo() override; - //! \copydoc ISimulator::disconnectFrom() virtual bool disconnectFrom() override; diff --git a/src/plugins/simulator/fsx/simulator_fsx.cpp b/src/plugins/simulator/fsx/simulator_fsx.cpp index b68382373..f283668ea 100644 --- a/src/plugins/simulator/fsx/simulator_fsx.cpp +++ b/src/plugins/simulator/fsx/simulator_fsx.cpp @@ -78,30 +78,6 @@ 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(oldStatus); - return false; - } - else - { - if (m_useFsuipc) { this->m_fsuipc->connect(); } // connect FSUIPC too - } - - initWhenConnected(); - m_simconnectTimerId = startTimer(10); - m_simConnected = true; - emitSimulatorCombinedStatus(oldStatus); - return true; - } - - void CSimulatorFsx::asyncConnectTo() { connect(&m_watcherConnect, SIGNAL(finished()), this, SLOT(ps_connectToFinished())); @@ -115,6 +91,8 @@ namespace BlackSimPlugin QFuture result = QtConcurrent::run(asyncConnectFunc); m_watcherConnect.setFuture(result); + + return true; } bool CSimulatorFsx::disconnectFrom() diff --git a/src/plugins/simulator/fsx/simulator_fsx.h b/src/plugins/simulator/fsx/simulator_fsx.h index 969d7debd..c2ccdcb09 100644 --- a/src/plugins/simulator/fsx/simulator_fsx.h +++ b/src/plugins/simulator/fsx/simulator_fsx.h @@ -90,9 +90,6 @@ namespace BlackSimPlugin //! \copydoc ISimulator::connectTo() virtual bool connectTo() override; - //! \copydoc ISimulator::asyncConnectTo() - virtual void asyncConnectTo() override; - //! \copydoc ISimulator::disconnectFrom() virtual bool disconnectFrom() override;