AaronFiore/electrum
1
0
Fork 0
Code Activity

fix #2257

Browse Source
This commit is contained in:
ThomasV
2017-03-08 11:56:01 +01:00
parent ed42faa2e6
commit 0f8387dbab
2 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
gui/qt/__init__.py
View File

@@ -154,18 +154,13 @@ class ElectrumGui:
w.bring_to_top()
break
else:
wallet = self.daemon.get_wallet(path)
wallet = self.daemon.load_wallet(path, None)
if not wallet:
storage = WalletStorage(path)
if not storage.file_exists() or storage.is_encrypted():
wizard = InstallWizard(self.config, self.app, self.plugins, storage)
wallet = wizard.run_and_get_wallet()
if not wallet:
return
else:
wallet = Wallet(storage)
wallet.start_threads(self.daemon.network)
self.daemon.add_wallet(wallet)
wizard = InstallWizard(self.config, self.app, self.plugins, storage)
wallet = wizard.run_and_get_wallet()
if not wallet:
return
w = self.create_window_for_wallet(wallet)
if uri:
w.pay_to_URI(uri)