Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/bugfix/9092_keywords_for_threads…
Browse files Browse the repository at this point in the history
…afe_call'
  • Loading branch information
martyngigg committed Feb 27, 2014
2 parents 27cf68d + c182fe6 commit 890a51a
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Code/Mantid/MantidPlot/mantidplotpy/proxies.py
Expand Up @@ -81,15 +81,15 @@ def _get_argtype(self, argument):
argtype = int
return argtype

def threadsafe_call(callable, *args):
def threadsafe_call(callable, *args, **kwargs):
"""
Calls the given function with the given arguments
by passing it through the CrossThreadCall class. This
ensures that the calls to the GUI functions
happen on the correct thread.
"""
caller = CrossThreadCall(callable)
return caller.dispatch(*args)
return caller.dispatch(*args, **kwargs)

def new_proxy(classType, callable, *args, **kwargs):
"""
Expand Down

0 comments on commit 890a51a

Please sign in to comment.