wizard: make sure terminate is always called
This commit is contained in:
parent
f33ee01e64
commit
bfcfb1f240
|
@ -173,6 +173,7 @@ class ElectrumGui:
|
||||||
storage = WalletStorage(path)
|
storage = WalletStorage(path)
|
||||||
wizard = InstallWizard(self.config, self.app, self.plugins, storage)
|
wizard = InstallWizard(self.config, self.app, self.plugins, storage)
|
||||||
wallet = wizard.run_and_get_wallet()
|
wallet = wizard.run_and_get_wallet()
|
||||||
|
wizard.terminate()
|
||||||
if not wallet:
|
if not wallet:
|
||||||
return
|
return
|
||||||
wallet.start_threads(self.daemon.network)
|
wallet.start_threads(self.daemon.network)
|
||||||
|
|
|
@ -251,7 +251,6 @@ class InstallWizard(QDialog, MessageBoxMixin, BaseWizard):
|
||||||
self.storage.upgrade()
|
self.storage.upgrade()
|
||||||
self.show_warning(_('Your wallet was upgraded successfully'))
|
self.show_warning(_('Your wallet was upgraded successfully'))
|
||||||
self.wallet = Wallet(self.storage)
|
self.wallet = Wallet(self.storage)
|
||||||
self.terminate()
|
|
||||||
return self.wallet
|
return self.wallet
|
||||||
|
|
||||||
action = self.storage.get_action()
|
action = self.storage.get_action()
|
||||||
|
@ -271,7 +270,6 @@ class InstallWizard(QDialog, MessageBoxMixin, BaseWizard):
|
||||||
return self.wallet
|
return self.wallet
|
||||||
|
|
||||||
self.wallet = Wallet(self.storage)
|
self.wallet = Wallet(self.storage)
|
||||||
self.terminate()
|
|
||||||
return self.wallet
|
return self.wallet
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue