electrum

commit b6c494ce6a11b620ef932c97d8eef75c2e7630d1
parent d2c91d9a0f30370a1392d3e4c06b54b9ca981b1d
Author: ThomasV <thomasv@gitorious>
Date:   Tue, 20 Nov 2012 21:46:45 +0100

fix network dialog

Diffstat:
M
electrum
 | 
10
++++++----
M
lib/gui_qt.py
 | 
3
+--

2 files changed, 7 insertions(+), 6 deletions(-)
diff --git 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
@@ -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()