main: command line option for socks5 proxy

2020-08-29 23:21:32 +02:00
parent d313c2de37
commit 0fcaadae53
3 changed files with 13 additions and 6 deletions
--- a/main.qml
+++ b/main.qml
@@ -1423,13 +1423,14 @@ ApplicationWindow {
        property string proxyAddress: "127.0.0.1:9050"
        property bool proxyEnabled: false
        function getProxyAddress() {
-            if (!proxyEnabled) {
+            if ((socksProxyFlagSet && socksProxyFlag == "") || !proxyEnabled) {
                return "";
            }
-            if (proxyAddress == "") {
+            var proxyAddressSetOrForced = socksProxyFlagSet ? socksProxyFlag : proxyAddress;
+            if (proxyAddressSetOrForced == "") {
                return "127.0.0.1:0";
            }
-            return proxyAddress;
+            return proxyAddressSetOrForced;
        }
        function getWalletProxyAddress() {
            if (!useRemoteNode) {