Properly handle the default argument in get_option when the requested plugin does not exist.

This commit is contained in:
Charles Haley 2012-07-25 08:58:08 +02:00
parent ebd777bac8
commit abbc24e9c1

View File

@ -539,7 +539,7 @@ class DeviceManager(Thread): # {{{
return self.dynamic_plugin_responses.get()
except:
traceback.print_exc()
return None
return kwargs.get('default', None)
# The dynamic plugin methods below must be called on the GUI thread. They
# will switch to the device thread before calling the plugin.