Beremiz_service.py
changeset 1841 9fd29e8b1393
parent 1834 cd42b426028b
child 1847 6198190bc121
equal deleted inserted replaced
1840:cf5ef4c0deff 1841:9fd29e8b1393
   508         tocall, args, kwargs = obj.call
   508         tocall, args, kwargs = obj.call
   509         obj.res = default_evaluator(tocall, *args, **kwargs)
   509         obj.res = default_evaluator(tocall, *args, **kwargs)
   510         wx_eval_lock.release()
   510         wx_eval_lock.release()
   511 
   511 
   512     def evaluator(tocall, *args, **kwargs):
   512     def evaluator(tocall, *args, **kwargs):
   513         global main_thread
       
   514         if main_thread == currentThread():
   513         if main_thread == currentThread():
   515             # avoid dead lock if called from the wx mainloop
   514             # avoid dead lock if called from the wx mainloop
   516             return default_evaluator(tocall, *args, **kwargs)
   515             return default_evaluator(tocall, *args, **kwargs)
   517         else:
   516         else:
   518             o = type('', (object,), dict(call=(tocall, args, kwargs), res=None))
   517             o = type('', (object,), dict(call=(tocall, args, kwargs), res=None))