AaronFiore/electrum
1
0
Fork 0
Code Activity

Register loaded wallets in daemon, to prevent a wallet from being opened twice.

Browse Source 
Simplify the wizard logic.
This commit is contained in:
ThomasV
2016-01-05 13:51:03 +01:00
parent 3d9f321cae
commit 62868ab29a
10 changed files with 78 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
electrum
View File

@@ -98,12 +98,12 @@ def prompt_password(prompt, confirm=True):
def init_gui(config, network, plugins):
def init_gui(config, network, daemon, plugins):
gui_name = config.get('gui', 'qt')
if gui_name in ['lite', 'classic']:
gui_name = 'qt'
gui = __import__('electrum_gui.' + gui_name, fromlist=['electrum_gui'])
gui = gui.ElectrumGui(config, network, plugins)
gui = gui.ElectrumGui(config, network, daemon, plugins)
return gui
@@ -343,9 +343,10 @@ if __name__ == '__main__':
plugins.start()
else:
network = None
gui = init_gui(config, network, plugins)
daemon = Daemon(config, network, gui)
daemon = Daemon(config, network)
daemon.start()
gui = init_gui(config, network, daemon, plugins)
daemon.gui = gui
gui.main()
sys.exit(0)