aboutsummaryrefslogtreecommitdiff
path: root/main.qml
diff options
context:
space:
mode:
authorselsta <selsta@sent.at>2020-08-29 23:21:32 +0200
committerselsta <selsta@sent.at>2020-09-28 01:57:47 +0200
commit0fcaadae530167df5be37712f2a0972618c6fbc5 (patch)
treed58a6b76277fbf102b1da56161c0cfac48c342b6 /main.qml
parentd313c2de377e5163a27835d28a835c274ee7abf4 (diff)
downloadmonzero-gui-0fcaadae530167df5be37712f2a0972618c6fbc5.tar.gz
monzero-gui-0fcaadae530167df5be37712f2a0972618c6fbc5.tar.xz
monzero-gui-0fcaadae530167df5be37712f2a0972618c6fbc5.zip
main: command line option for socks5 proxy
Diffstat (limited to 'main.qml')
-rw-r--r--main.qml7
1 files changed, 4 insertions, 3 deletions
diff --git a/main.qml b/main.qml
index 9e8e1a84..1acab8f2 100644
--- 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) {