AaronFiore/electrum
1
0
Fork 0
Code Activity

do not expose network to wizard. update message in issue #1972

Browse Source
This commit is contained in:
ThomasV
2016-10-14 14:05:24 +02:00
parent bab15a245b
commit 7ea91dde2e
6 changed files with 34 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
gui/kivy/main_window.py
View File

@@ -410,6 +410,7 @@ class ElectrumWindow(App):
def on_wizard_complete(self, instance, wallet):
if wallet:
wallet.start_threads(self.daemon.network)
self.daemon.add_wallet(wallet)
self.load_wallet(wallet)
self.on_resume()
@@ -425,7 +426,7 @@ class ElectrumWindow(App):
self.on_resume()
else:
Logger.debug('Electrum: Wallet not found. Launching install wizard')
wizard = Factory.InstallWizard(self.electrum_config, self.network, path)
wizard = Factory.InstallWizard(self.electrum_config, path)
wizard.bind(on_wizard_complete=self.on_wizard_complete)
action = wizard.storage.get_action()
wizard.run(action)

1
gui/kivy/uix/dialogs/installwizard.py
View File

@@ -759,7 +759,6 @@ class InstallWizard(BaseWizard, Widget):
t.start()
def terminate(self, **kwargs):
self.wallet.start_threads(self.network)
self.dispatch('on_wizard_complete', self.wallet)
def choice_dialog(self, **kwargs):