electrum

commit 4a7c7a66162c04fcaeeecb2c79942ee06a2b4da5
parent 2d6c67bd550ffa197df46298874caa68bb35a52c
Author: ThomasV <thomasv@electrum.org>
Date:   Mon,  2 Nov 2015 12:58:47 +0100

installwizard: do not start in offline mode when disconnected (fix #1531)

Diffstat:
M
gui/qt/installwizard.py
 | 
27
+++++----------------------

1 file changed, 5 insertions(+), 22 deletions(-)
diff --git a/gui/qt/installwizard.py b/gui/qt/installwizard.py
@@ -270,40 +270,23 @@ class InstallWizard(QDialog):
         self.exec_()
 
 
-
-
     def network_dialog(self):
-        # skip this if config already exists
-        if self.config.get('server') is not None:
-            return
-
         grid = QGridLayout()
         grid.setSpacing(5)
-
         label = QLabel(_("Electrum communicates with remote servers to get information about your transactions and addresses. The servers all fulfil the same purpose only differing in hardware. In most cases you simply want to let Electrum pick one at random if you have a preference though feel free to select a server manually.") + "\n\n" \
                       + _("How do you want to connect to a server:")+" ")
         label.setWordWrap(True)
         grid.addWidget(label, 0, 0)
-
         gb = QGroupBox()
-
         b1 = QRadioButton(gb)
         b1.setText(_("Auto connect"))
         b1.setChecked(True)
-
         b2 = QRadioButton(gb)
         b2.setText(_("Select server manually"))
-
-        #b3 = QRadioButton(gb)
-        #b3.setText(_("Stay offline"))
-
         grid.addWidget(b1,1,0)
         grid.addWidget(b2,2,0)
-        #grid.addWidget(b3,3,0)
-
         vbox = QVBoxLayout()
         vbox.addLayout(grid)
-
         vbox.addStretch(1)
         vbox.addLayout(Buttons(CancelButton(self), OkButton(self, _('Next'))))
 
@@ -539,12 +522,12 @@ class InstallWizard(QDialog):
 
 
         if self.network:
-            if self.network.interfaces:
+            # show network dialog if config does not exist
+            if self.config.get('server') is None:
                 self.network_dialog()
-            else:
-                QMessageBox.information(None, _('Warning'), _('You are offline'), _('OK'))
-                self.network.stop()
-                self.network = None
+        else:
+            QMessageBox.information(None, _('Warning'), _('You are offline'), _('OK'))
+
 
         # start wallet threads
         wallet.start_threads(self.network)