From bf942b5259c10e7d0f312a341cef8dfefbb31d9c Mon Sep 17 00:00:00 2001 From: Neil Booth Date: Wed, 27 Jan 2016 21:27:51 +0900 Subject: [PATCH] Trezor: another place needs client handler set --- lib/plugins.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/plugins.py b/lib/plugins.py index b528668a1..9d806b522 100644 --- a/lib/plugins.py +++ b/lib/plugins.py @@ -358,6 +358,9 @@ class DeviceMgr(PrintError): client = self.client_lookup(wallet_id) 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 for device in devices: @@ -374,8 +377,7 @@ class DeviceMgr(PrintError): if info: client = self.client_lookup(info.device.id_) if client and not client.features.bootloader_mode: - # An unpaired client might have another wallet's handler - # from a prior scan. Replace to fix dialog parenting. + # See comment above for same code client.handler = wallet.handler # This will trigger a PIN/passphrase entry request client_first_address = client.first_address(derivation)