electrum

commit 54695964d30e8d426d873d53e47090325ad98949
parent 1409f13947619ba254d6ad95b134a2aff9cc1810
Author: ThomasV <thomasv@electrum.org>
Date:   Fri, 29 Jan 2016 12:46:35 +0100

Merge branch 'master' of git://github.com/spesmilo/electrum

Diffstat:
M
lib/plugins.py
 | 
2
+-
M
plugins/trezor/clientbase.py
 | 
3
+++

2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/lib/plugins.py b/lib/plugins.py
@@ -376,7 +376,7 @@ class DeviceMgr(PrintError):
             info = self.select_device(wallet, plugin, devices)
             if info:
                 client = self.client_lookup(info.device.id_)
-                if client and not client.features.bootloader_mode:
+                if client and client.is_pairable():
                     # See comment above for same code
                     client.handler = wallet.handler
                     # This will trigger a PIN/passphrase entry request
diff --git a/plugins/trezor/clientbase.py b/plugins/trezor/clientbase.py
@@ -94,6 +94,9 @@ class TrezorClientBase(GuiMixin, PrintError):
         '''True if initialized, False if wiped.'''
         return self.features.initialized
 
+    def is_pairable(self):
+        return not client.features.bootloader_mode
+
     @staticmethod
     def expand_path(n):
         '''Convert bip32 path to list of uint32 integers with prime flags