Merge branch 'master' of github.com:Atheros1/PyBitmessage into askToConnectFirst

src/bitmessageqt/__init__.py

@@ -1967,7 +1967,7 @@ class MyForm(QtGui.QMainWindow):
             if shared.config.get('bitmessagesettings', 'socksproxytype') == 'none' and str(self.settingsDialogInstance.ui.comboBoxProxyType.currentText())[0:5] == 'SOCKS':
                 if shared.statusIconColor != 'red':
                     QMessageBox.about(self, _translate("MainWindow", "Restart"), _translate(
-                        "MainWindow", "Bitmessage will use your proxy from now on but you may want to manually restart Bitmessage now to close existing connections."))
+                        "MainWindow", "Bitmessage will use your proxy from now on but you may want to manually restart Bitmessage now to close existing connections (if any)."))
             if shared.config.get('bitmessagesettings', 'socksproxytype')[0:5] == 'SOCKS' and str(self.settingsDialogInstance.ui.comboBoxProxyType.currentText()) == 'none':
                 self.statusBar().showMessage('')
             shared.config.set('bitmessagesettings', 'socksproxytype', str(

src/class_sqlThread.py

@@ -186,6 +186,9 @@ class sqlThread(threading.Thread):
         self.cur.execute(
             '''update sent set status='broadcastqueued' where status='broadcastpending'  ''')
         self.conn.commit()
+        
+        if not shared.config.has_option('bitmessagesettings', 'sockslisten'):
+            shared.config.set('bitmessagesettings', 'sockslisten', 'false')
 
         try:
             testpayload = '\x00\x00'

src/helper_startup.py

@@ -81,9 +81,3 @@ def loadConfig():
                 os.umask(0o077)
             with open(shared.appdata + 'keys.dat', 'wb') as configfile:
                 shared.config.write(configfile)
-
-        # Initialize settings that may be missing due to upgrades and could
-        # cause errors if missing.
-        if not shared.config.has_option('bitmessagesettings', 'sockslisten'):
-            shared.config.set('bitmessagesettings', 'sockslisten', 'false')
-