AaronFiore/electrum
1
0
Fork 0
Code Activity

Trezor: another place needs client handler set

Browse Source
This commit is contained in:
Neil Booth
2016-01-27 21:27:51 +09:00
parent 963dcf0c6b
commit bf942b5259
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/plugins.py
View File

@@ -358,6 +358,9 @@ class DeviceMgr(PrintError):
client = self.client_lookup(wallet_id) client = self.client_lookup(wallet_id)
if client: if client:
# An unpaired client might have another wallet's handler
# from a prior scan. Replace to fix dialog parenting.
client.handler = wallet.handler
return client return client
for device in devices: for device in devices:
@@ -374,8 +377,7 @@ class DeviceMgr(PrintError):
if info: if info:
client = self.client_lookup(info.device.id_) client = self.client_lookup(info.device.id_)
if client and not client.features.bootloader_mode: if client and not client.features.bootloader_mode:
# An unpaired client might have another wallet's handler # See comment above for same code
# from a prior scan. Replace to fix dialog parenting.
client.handler = wallet.handler client.handler = wallet.handler
# This will trigger a PIN/passphrase entry request # This will trigger a PIN/passphrase entry request
client_first_address = client.first_address(derivation) client_first_address = client.first_address(derivation)