From b6c494ce6a11b620ef932c97d8eef75c2e7630d1 Mon Sep 17 00:00:00 2001
From: ThomasV <thomasv@gitorious>
Date: Tue, 20 Nov 2012 21:46:45 +0100
Subject: [PATCH] fix network dialog

---
 electrum      | 10 ++++++----
 lib/gui_qt.py |  3 +--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/electrum b/electrum
index 46d1c60f..0e45750b 100755
--- a/electrum
+++ b/electrum
@@ -222,10 +222,9 @@ if __name__ == '__main__':
 
             # generate the first addresses
             wallet.synchronize()
-            # display seed
-            gui.show_seed()
-            gui.password_dialog()
-            wallet.save()
+            if a == 'create':
+                # display seed
+                gui.show_seed()
 
         verifier = WalletVerifier(interface, config)
         wallet.set_verifier(verifier)
@@ -242,6 +241,9 @@ if __name__ == '__main__':
 
             if not keep_it: exit()
 
+        if not found:
+            gui.password_dialog()
+
         wallet.save()
         verifier.start()
         gui.main(url)
diff --git a/lib/gui_qt.py b/lib/gui_qt.py
index 260d6981..ea3b9edd 100644
--- a/lib/gui_qt.py
+++ b/lib/gui_qt.py
@@ -1371,8 +1371,7 @@ class ElectrumWindow(QMainWindow):
         else:
             import random
             status = _("Please choose a server.") + "\n" + _("Select 'Cancel' if you are offline.")
-            server = None
-            interface.proxy = None
+            server = interface.server
 
         plist, servers_list = interface.get_servers_list()