do not wait for interface when launching gui

This commit is contained in:
ecdsa 2013-03-10 10:15:09 +01:00
parent d848e9b91d
commit 49a4c6c92a
2 changed files with 10 additions and 8 deletions

View File

@ -125,8 +125,7 @@ if __name__ == '__main__':
interface = Interface(config, True)
wallet.interface = interface
interface.start()
if interface.is_connected:
interface.send([('server.peers.subscribe',[])])
interface.send([('server.peers.subscribe',[])])
gui = gui.ElectrumGui(wallet, config)
@ -241,8 +240,11 @@ if __name__ == '__main__':
if not options.offline:
interface = Interface(config)
interface.start()
interface.connect_event.wait()
if not interface.is_connected:
print_msg("Not connected, aborting.")
sys.exit(1)
wallet.interface = interface
verifier = WalletVerifier(interface, config)
wallet.set_verifier(verifier)
@ -359,6 +361,11 @@ if __name__ == '__main__':
interface = Interface(config)
interface.register_callback('connected', lambda: sys.stderr.write("Connected to " + interface.connection_msg + "\n"))
interface.start()
# wait until connected
interface.connect_event.wait()
if not interface.is_connected:
print_msg("Not connected, aborting.")
sys.exit(1)
wallet.interface = interface
verifier = WalletVerifier(interface, config)
wallet.set_verifier(verifier)

View File

@ -586,11 +586,6 @@ class Interface(threading.Thread):
return out
def start(self):
threading.Thread.start(self)
# wait until connection is established
self.connect_event.wait()
def run(self):
while True:
self.init_interface()