Merge branch 'master' of git://github.com/spesmilo/electrum
This commit is contained in:
commit
54695964d3
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue