BTCPrivate
/
-WIP-electrum-btcp
mirror of https://github.com/BTCPrivate/-WIP-electrum-btcp.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

This commit is contained in:
ThomasV 2016-01-27 16:54:43 +01:00
parent 78e9a84c2f 9fa8c4de27
commit e7d28f555a
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gui/qt/installwizard.py
View File

@ -64,11 +64,11 @@ class CosignWidget(QWidget):
# WindowModalDialog must come first as it overrides show_error # WindowModalDialog must come first as it overrides show_error
class InstallWizard(WindowModalDialog, WizardBase): class InstallWizard(QDialog, MessageBoxMixin, WizardBase):
def __init__(self, config, app, plugins): def __init__(self, config, app, plugins):
title = 'Electrum - ' + _('Install Wizard') QDialog.__init__(self, None)
WindowModalDialog.__init__(self, None, title=title) self.setWindowTitle('Electrum - ' + _('Install Wizard'))
self.app = app self.app = app
self.config = config self.config = config
# Set for base base class # Set for base base class

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)