tMerge branch 'master' of git://github.com/spesmilo/electrum - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit e7d28f555af9f198a2f588879882de4c7bdf2df6
DIR parent 78e9a84c2f2ed09800f0e571e39c0bf071fca64d
HTML Author: ThomasV <thomasv@electrum.org>
Date: Wed, 27 Jan 2016 16:54:43 +0100
Merge branch 'master' of git://github.com/spesmilo/electrum
Diffstat:
M gui/qt/installwizard.py | 6 +++---
M lib/plugins.py | 6 ++++--
2 files changed, 7 insertions(+), 5 deletions(-)
---
DIR diff --git a/gui/qt/installwizard.py b/gui/qt/installwizard.py
t@@ -64,11 +64,11 @@ class CosignWidget(QWidget):
# WindowModalDialog must come first as it overrides show_error
-class InstallWizard(WindowModalDialog, WizardBase):
+class InstallWizard(QDialog, MessageBoxMixin, WizardBase):
def __init__(self, config, app, plugins):
- title = 'Electrum - ' + _('Install Wizard')
- WindowModalDialog.__init__(self, None, title=title)
+ QDialog.__init__(self, None)
+ self.setWindowTitle('Electrum - ' + _('Install Wizard'))
self.app = app
self.config = config
# Set for base base class
DIR diff --git a/lib/plugins.py b/lib/plugins.py
t@@ -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:
t@@ -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)