From c35f48bd0bdd7581571be6ee111d6530c00246b8 Mon Sep 17 00:00:00 2001
From: Dmitri Bogomolov <4glitch@gmail.com>
Date: Sun, 22 Sep 2019 15:35:10 +0300
Subject: [PATCH] Fix setting socksproxytype and return in proxyconfig_stem:

socksproxytype is set to SOCKS5 temporary if proxyconfig succeeds.
---
 src/plugins/proxyconfig_stem.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/plugins/proxyconfig_stem.py b/src/plugins/proxyconfig_stem.py
index bdbfe8ca..e56aecc6 100644
--- a/src/plugins/proxyconfig_stem.py
+++ b/src/plugins/proxyconfig_stem.py
@@ -43,6 +43,7 @@ def connect_plugin(config):  # pylint: disable=too-many-branches
     ):
         # remote proxy is choosen for outbound connections,
         # nothing to do here, but need to set socksproxytype to SOCKS5!
+        config.set('bitmessagesettings', 'socksproxytype', 'SOCKS5')
         logwrite(
             'sockshostname is set to remote address,'
             ' aborting stem proxy configuration')
@@ -77,6 +78,8 @@ def connect_plugin(config):  # pylint: disable=too-many-branches
             logwrite('Started tor on port %s' % port)
             break
 
+    config.setTemp('bitmessagesettings', 'socksproxytype', 'SOCKS5')
+
     if config.safeGetBoolean('bitmessagesettings', 'sockslisten'):
         # need a hidden service for inbound connections
         try:
@@ -117,6 +120,5 @@ def connect_plugin(config):  # pylint: disable=too-many-branches
                 config.set(
                     onionhostname, 'keytype', response.private_key_type)
                 config.save()
-        config.set('bitmessagesettings', 'socksproxytype', 'SOCKS5')
 
-        return True
+    return True