Beremiz_service.py
changeset 2189 49a6738b7c63
parent 2177 10aa87518401
parent 2018 983c482f8e42
child 2245 fe3394697b02
--- a/Beremiz_service.py	Fri Jun 15 16:41:55 2018 +0300
+++ b/Beremiz_service.py	Mon Jun 18 12:12:57 2018 +0300
@@ -499,7 +499,7 @@
 
 if havewx:
     wx_eval_lock = Semaphore(0)
-    main_thread = currentThread()
+    # main_thread = currentThread()
 
     def statuschangeTskBar(status):
         wx.CallAfter(taskbar_instance.UpdateIcon, status)
@@ -512,14 +512,14 @@
         wx_eval_lock.release()
 
     def evaluator(tocall, *args, **kwargs):
-        if main_thread == currentThread():
-            # avoid dead lock if called from the wx mainloop
-            return default_evaluator(tocall, *args, **kwargs)
-        else:
-            o = type('', (object,), dict(call=(tocall, args, kwargs), res=None))
-            wx.CallAfter(wx_evaluator, o)
-            wx_eval_lock.acquire()
-            return o.res
+        # if main_thread == currentThread():
+        #     # avoid dead lock if called from the wx mainloop
+        #     return default_evaluator(tocall, *args, **kwargs)
+        # else:
+        o = type('', (object,), dict(call=(tocall, args, kwargs), res=None))
+        wx.CallAfter(wx_evaluator, o)
+        wx_eval_lock.acquire()
+        return o.res
 
     pyroserver = Server(servicename, given_ip, port,
                         WorkingDir, argv,