Merge pull request #3089

0fcaadae main: command line option for socks5 proxy (selsta)
2020-09-28 19:06:58 -07:00
parent a32d39cc96 0fcaadae53
commit 22386aa7e1
3 changed files with 13 additions and 6 deletions
--- a/main.qml
+++ b/main.qml
@@ -1427,13 +1427,14 @@ ApplicationWindow {
        property string proxyAddress: "127.0.0.1:9050"
        property bool proxyEnabled: isTails
        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) {