From 91d2556b1665f792699ba4fc8d516a5411a5f7d3 Mon Sep 17 00:00:00 2001
From: Roland Winklmeier <Roland.M.Winklmeier@gmail.com>
Date: Thu, 14 Jul 2016 15:48:59 +0200
Subject: [PATCH] [FSX] Signal simulator connected once SIMCONNECT_RECV_OPEN is
 received

refs #549
---
 src/plugins/simulator/fsx/simulatorfsx.cpp               | 8 ++++++--
 src/plugins/simulator/fsx/simulatorfsx.h                 | 3 +++
 src/plugins/simulator/fsx/simulatorfsxsimconnectproc.cpp | 1 +
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/plugins/simulator/fsx/simulatorfsx.cpp b/src/plugins/simulator/fsx/simulatorfsx.cpp
index 944feaee7..9f77fe460 100644
--- a/src/plugins/simulator/fsx/simulatorfsx.cpp
+++ b/src/plugins/simulator/fsx/simulatorfsx.cpp
@@ -95,8 +95,6 @@ namespace BlackSimPlugin
             initEvents();
             initDataDefinitionsWhenConnected();
             m_simconnectTimerId = startTimer(10);
-            m_simConnected = true;
-            emitSimulatorCombinedStatus();
             return true;
         }
 
@@ -296,6 +294,12 @@ namespace BlackSimPlugin
             return CCollection<CCallsign>(this->m_simConnectObjects.keys());
         }
 
+        void CSimulatorFsx::setSimConnected()
+        {
+            m_simConnected = true;
+            emitSimulatorCombinedStatus();
+        }
+
         void CSimulatorFsx::onSimRunning()
         {
             if (m_simSimulating) { return; }
diff --git a/src/plugins/simulator/fsx/simulatorfsx.h b/src/plugins/simulator/fsx/simulatorfsx.h
index b6a310f09..4b8f761c7 100644
--- a/src/plugins/simulator/fsx/simulatorfsx.h
+++ b/src/plugins/simulator/fsx/simulatorfsx.h
@@ -146,6 +146,9 @@ namespace BlackSimPlugin
             void ps_reloadSettings();
 
         private:
+            //! Call this method to declare the simulator connected
+            void setSimConnected();
+
             //! Called when sim has started
             void onSimRunning();
 
diff --git a/src/plugins/simulator/fsx/simulatorfsxsimconnectproc.cpp b/src/plugins/simulator/fsx/simulatorfsxsimconnectproc.cpp
index 868735af6..86ae7750c 100644
--- a/src/plugins/simulator/fsx/simulatorfsxsimconnectproc.cpp
+++ b/src/plugins/simulator/fsx/simulatorfsxsimconnectproc.cpp
@@ -45,6 +45,7 @@ namespace BlackSimPlugin
                                                      .arg(event->dwApplicationVersionMajor).arg(event->dwApplicationVersionMinor).arg(event->dwApplicationBuildMajor).arg(event->dwApplicationBuildMinor)
                                                      .arg(event->dwSimConnectVersionMajor).arg(event->dwSimConnectVersionMinor).arg(event->dwSimConnectBuildMajor).arg(event->dwSimConnectBuildMinor);
                     CLogMessage(static_cast<CSimulatorFsx *>(nullptr)).info("Connect to FSX: %1") << sApp->swiftVersionString();
+                    simulatorFsx->setSimConnected();
                     break;
                 }
             case SIMCONNECT_RECV_ID_EXCEPTION: