From a4f977190e0a1f64f5badca430c492b2000709a6 Mon Sep 17 00:00:00 2001
From: thomasv <thomasv@gitorious>
Date: Wed, 13 Mar 2013 15:26:29 +0100
Subject: [PATCH] do not call exit() in the interface module

---
 electrum         | 8 ++++++--
 lib/interface.py | 4 ++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/electrum b/electrum
index a3961e71..dfa71112 100755
--- a/electrum
+++ b/electrum
@@ -241,7 +241,9 @@ if __name__ == '__main__':
 
             if not options.offline:
                 interface = Interface(config)
-                interface.start(wait=True)
+                if not interface.start(wait=True):
+                    print_msg("Not connected, aborting.")
+                    sys.exit(1)
                 wallet.interface = interface
                 verifier = WalletVerifier(interface, config)
                 verifier.start()
@@ -359,7 +361,9 @@ if __name__ == '__main__':
     if cmd not in offline_commands and not options.offline:
         interface = Interface(config)
         interface.register_callback('connected', lambda: sys.stderr.write("Connected to " + interface.connection_msg + "\n"))
-        interface.start()
+        if not interface.start(wait=True):
+            print_msg("Not connected, aborting.")
+            sys.exit(1)
         wallet.interface = interface
         verifier = WalletVerifier(interface, config)
         verifier.start()
diff --git a/lib/interface.py b/lib/interface.py
index eeca9a4a..ea787dda 100644
--- a/lib/interface.py
+++ b/lib/interface.py
@@ -595,8 +595,8 @@ class Interface(threading.Thread):
             # wait until connection is established
             self.connect_event.wait()
             if not self.is_connected:
-                print_msg("Not connected, aborting.")
-                sys.exit(1)
+                return False
+        return True
 
     def run(self):
         while True: