From 1b47ad594afa2f803b1f6f28312721f37b7552cd Mon Sep 17 00:00:00 2001
From: developer3 <support@d-logic.rs>
Date: Fri, 22 Jun 2018 10:14:21 +0200
Subject: [PATCH] BUGFIX: never set command finished on some error in
 MainLoop()

and other flags
---
 ais_shell.py | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/ais_shell.py b/ais_shell.py
index 1e8ed40..536da44 100644
--- a/ais_shell.py
+++ b/ais_shell.py
@@ -840,15 +840,7 @@ def MainLoop(dev):
         dev.TimeoutOccurred = time_out_occurred.value
         dev.Status = _status.value
 
-        if dev.status:
-            if dev.status_last != dev.status:
-                p_print = wr_status("MainLoop()", dev.status)
-                dev.status_last = dev.status
-                if GetBaseName() == AIS_SHELL:
-                    print p_print
-            return False, None
-
-        if dev.RealTimeEvents > 0:
+        if dev.RealTimeEvents:
             rte = PrintRTE(dev)
             p_print = "".join(rte)
             if GetBaseName() == AIS_SHELL:
@@ -860,7 +852,7 @@ def MainLoop(dev):
                 print p_print
             PrintLOG(dev)
 
-        if dev.UnreadLog != 0:
+        if dev.UnreadLog:
             if dev.UnreadLog_last != dev.UnreadLog:
                 dev.UnreadLog_last = dev.UnreadLog
                 if GetBaseName() == AIS_SHELL:
@@ -883,6 +875,14 @@ def MainLoop(dev):
             p_print = "\n-- COMMAND FINISH !\n"
             dev.cmd_finish = True
 
+        if dev.status:
+            if dev.status_last != dev.status:
+                p_print = wr_status("MainLoop()", dev.status)
+                dev.status_last = dev.status
+                if GetBaseName() == AIS_SHELL:
+                    print p_print
+            return False, None
+
         rte = "".join(p_print)
         return True, rte
     except Exception as exc:
-- 
GitLab