AaronFiore/electrum
1
0
Fork 0
Code Activity

hw plugins: fix DeviceMgr.select_device

Browse Source 
regression from ChoiceWidget refactor

follow-up f7749d62aa
This commit is contained in:
SomberNight
2025-05-06 17:26:41 +00:00
parent dfb7a8ab5a
commit ef49bb2109
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
electrum/gui/qt/util.py
View File

@@ -542,6 +542,7 @@ class ChoiceWidget(QWidget):
assert isinstance(choices, list) assert isinstance(choices, list)
iterator = enumerate(choices) iterator = enumerate(choices)
for i, c in iterator: for i, c in iterator:
assert isinstance(c, tuple), f"{c=!r}"
button = QRadioButton(gb2) button = QRadioButton(gb2)
button.setText(c[1]) button.setText(c[1])
vbox2.addWidget(button) vbox2.addWidget(button)

3
electrum/plugin.py
View File

@@ -1076,7 +1076,8 @@ class DeviceMgr(ThreadJob):
for info in infos] for info in infos]
self.logger.debug(f"select_device. prompting user for manual selection of {plugin.device}. " self.logger.debug(f"select_device. prompting user for manual selection of {plugin.device}. "
f"num options: {len(infos)}. options: {infos}") f"num options: {len(infos)}. options: {infos}")
c = handler.query_choice(msg, descriptions) choices = list(enumerate(descriptions))
c = handler.query_choice(msg, choices)
if c is None: if c is None:
raise UserCancelled() raise UserCancelled()
info = infos[c] info = infos[c]