From a6dd7fdd0939725563d6e5f45ada751dfbb15642 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Tue, 2 Jun 2015 00:13:22 +0200 Subject: [PATCH] refs #438, fixed assert situation in FS9 driver --- src/plugins/simulator/fs9/simulator_fs9.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/plugins/simulator/fs9/simulator_fs9.cpp b/src/plugins/simulator/fs9/simulator_fs9.cpp index 22caaeab6..3797689d6 100644 --- a/src/plugins/simulator/fs9/simulator_fs9.cpp +++ b/src/plugins/simulator/fs9/simulator_fs9.cpp @@ -74,9 +74,9 @@ namespace BlackSimPlugin bool CSimulatorFs9::connectTo() { - Q_ASSERT(m_fsuipc); - Q_ASSERT(fs9Host->isConnected()); + if (!fs9Host->isConnected()) { return false; } // host not available, we quit + Q_ASSERT_X(m_fsuipc, Q_FUNC_INFO, "No FSUIPC"); m_connectionHostMessages = connect(fs9Host.data(), &CFs9Host::customPacketReceived, this, &CSimulatorFs9::ps_processFs9Message); if (m_useFsuipc) @@ -84,7 +84,6 @@ namespace BlackSimPlugin m_fsuipc->connect(); // connect FSUIPC too } m_dispatchTimerId = startTimer(50); - return true; }