Check if on main thread for call_on_qt_thread

CURA-6225
This commit is contained in:
Lipu Fei 2019-02-15 12:51:40 +01:00
parent 61b84bdcfc
commit 21099e30cb

View file

@ -31,4 +31,10 @@ def call_on_qt_thread(func):
CuraApplication.getInstance().callLater(_handle_call, *new_args, **kwargs) CuraApplication.getInstance().callLater(_handle_call, *new_args, **kwargs)
inter_call_object.finish_event.wait() inter_call_object.finish_event.wait()
return inter_call_object.result return inter_call_object.result
# If the current thread is the main thread, which is the Qt thread, directly return the function.
current_thread = threading.current_thread()
if isinstance(current_thread, threading._MainThread):
return func
return _call_on_qt_thread_wrapper return _call_on_qt_thread_wrapper