From 6a9de7389a952c5533641954f7be2e86ade42f85 Mon Sep 17 00:00:00 2001
From: Klaus Basan <klaus.basan@klausbasan.de>
Date: Fri, 26 Apr 2019 01:14:32 +0200
Subject: [PATCH] Guards in emulated driver

---
 src/plugins/simulator/emulated/simulatoremulated.cpp | 9 ++++++++-
 src/plugins/simulator/emulated/simulatoremulated.h   | 3 +++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/plugins/simulator/emulated/simulatoremulated.cpp b/src/plugins/simulator/emulated/simulatoremulated.cpp
index 72b6e6b6f..de3dd3a5a 100644
--- a/src/plugins/simulator/emulated/simulatoremulated.cpp
+++ b/src/plugins/simulator/emulated/simulatoremulated.cpp
@@ -137,12 +137,14 @@ namespace BlackSimPlugin
 
         void CSimulatorEmulated::displayStatusMessage(const CStatusMessage &message) const
         {
+            if (!canDisplay()) { return; }
             if (canLog()) { m_monitorWidget->appendReceivingCall(Q_FUNC_INFO, message.toQString()); }
             m_monitorWidget->displayStatusMessage(message);
         }
 
         void CSimulatorEmulated::displayTextMessage(const CTextMessage &message) const
         {
+            if (!canDisplay()) { return; }
             if (canLog()) m_monitorWidget->appendReceivingCall(Q_FUNC_INFO, message.toQString());
             m_monitorWidget->displayTextMessage(message);
         }
@@ -341,7 +343,12 @@ namespace BlackSimPlugin
 
         bool CSimulatorEmulated::canLog() const
         {
-            return sApp && !sApp->isShuttingDown() && m_log && m_monitorWidget;
+            return this->canDisplay() && m_log;
+        }
+
+        bool CSimulatorEmulated::canDisplay() const
+        {
+            return sApp && !sApp->isShuttingDown() && m_monitorWidget;
         }
 
         void CSimulatorEmulated::closeMonitor()
diff --git a/src/plugins/simulator/emulated/simulatoremulated.h b/src/plugins/simulator/emulated/simulatoremulated.h
index e5358d6ce..932e25ecd 100644
--- a/src/plugins/simulator/emulated/simulatoremulated.h
+++ b/src/plugins/simulator/emulated/simulatoremulated.h
@@ -137,6 +137,9 @@ namespace BlackSimPlugin
             //! Can append log messages?
             bool canLog() const;
 
+            //! Can display
+            bool canDisplay() const;
+
             //! Close window
             void closeMonitor();