From d777b8c6114dca8ccc60f7ab55e7e6d76edb003c Mon Sep 17 00:00:00 2001
From: Klaus Basan <klaus.basan@klausbasan.de>
Date: Thu, 2 Nov 2017 20:17:15 +0100
Subject: [PATCH] Ref T180, fix emitting wrong status when disconnected

---
 src/blackcore/simulator.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/blackcore/simulator.cpp b/src/blackcore/simulator.cpp
index 8e12868cd..4f6f3a11e 100644
--- a/src/blackcore/simulator.cpp
+++ b/src/blackcore/simulator.cpp
@@ -24,10 +24,11 @@ namespace BlackCore
 {
     ISimulator::SimulatorStatus ISimulator::getSimulatorStatus() const
     {
+        if (!this->isConnected()) { return Disconnected; }
         const SimulatorStatus status =
-            (isConnected() ? Connected : static_cast<ISimulator::SimulatorStatusFlag>(0))
-            | (isSimulating() ? Simulating : static_cast<ISimulator::SimulatorStatusFlag>(0))
-            | (isPaused() ? Paused : static_cast<ISimulator::SimulatorStatusFlag>(0));
+            Connected
+            | (this->isSimulating() ? Simulating : static_cast<ISimulator::SimulatorStatusFlag>(0))
+            | (this->isPaused() ? Paused : static_cast<ISimulator::SimulatorStatusFlag>(0));
         return status;
     }