AaronFiore/electrum
1
0
Fork 0
Code Activity

hw plugins: catch exceptions for custom enumeration functions.

Browse Source 
related: #4060
This commit is contained in:
SomberNight
2018-03-07 16:11:20 +01:00
parent b02252d664
commit 192e895933
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/plugins.py
View File

@@ -533,7 +533,13 @@ class DeviceMgr(ThreadJob, PrintError):
# Let plugin handlers enumerate devices we don't know about # Let plugin handlers enumerate devices we don't know about
for f in self.enumerate_func: for f in self.enumerate_func:
devices.extend(f()) try:
new_devices = f()
except BaseException as e:
self.print_error('custom device enum failed. func {}, error {}'
.format(str(f), str(e)))
else:
devices.extend(new_devices)
# Now find out what was disconnected # Now find out what was disconnected
pairs = [(dev.path, dev.id_) for dev in devices] pairs = [(dev.path, dev.id_) for dev in devices]