qt: add proxy to options overridden if necessary. Fixes #4975 #4976

pull theuni wants to merge 1 commits into bitcoin:master from theuni:proxyoverride changing 1 files +2 −0

theuni commented at 2:34 AM on September 25, 2014: member

If proxy is disabled in the gui but enabled via the command line, it needs to be added to the override list.
in src/qt/optionsmodel.cpp:None in 7f882b31ad outdated
```
 118 | @@ -119,6 +119,8 @@ void OptionsModel::Init()
 119 |      // Only try to set -proxy, if user has enabled fUseProxy
 120 |      if (settings.value("fUseProxy").toBool() && !SoftSetArg("-proxy", settings.value("addrProxy").toString().toStdString()))
 121 |          addOverriddenOption("-proxy");
 122 | +    else if(!settings.value("fUseProxy").toBool() && GetBoolArg("-proxy", false))
```
laanwj commented at 6:15 AM on September 25, 2014:

GetBoolArg on -proxy?

theuni commented at 6:43 AM on September 25, 2014:

We only need to know if it was set to anything, since an invalid setting would cause an exit before getting this far.

I suppose GetArg("-proxy", "") would be more readable?

laanwj commented at 6:50 AM on September 25, 2014:

Indeed, please do that instead. That code is already bad enough without confusing argument types :-)

theuni commented at 7:18 AM on September 25, 2014:

Yep, fair enough. Will update.

laanwj commented at 7:46 AM on September 25, 2014:

@theuni to be clear I didn't mean to demean your code change, just that function in general

theuni commented at 7:52 AM on September 25, 2014:

@laanwj haha no worries, I understood :)
theuni force-pushed on Sep 25, 2014
theuni commented at 9:45 PM on September 25, 2014: member

Updated to use GetArg()

qt: add proxy to options overridden if necessary.

If proxy is disabled in the gui but enabled via the command line, it needs to
be added to the override list.

27c3e91014

BitcoinPullTester commented at 9:58 PM on September 25, 2014: none

Automatic sanity-testing: PASSED, see http://jenkins.bluematt.me/pull-tester/p4976_27c3e91014d65091b096b97680b95d1b130a284d/ for binaries and test log. This test script verifies pulls every time they are updated. It, however, dies sometimes and fails to test properly. If you are waiting on a test, please check timestamps to verify that the test.log is moving at http://jenkins.bluematt.me/pull-tester/current/ Contact BlueMatt on freenode if something looks broken.
laanwj commented at 8:14 AM on September 26, 2014: member

Untested ACK. @stevenwagner can you check if this solves your problem?
laanwj merged this on Oct 7, 2014
laanwj closed this on Oct 7, 2014
laanwj referenced this in commit 7c6cbff0e5 on Oct 7, 2014
MarcoFalke locked this on Sep 8, 2021

Contributors

theuni

laanwj

BitcoinPullTester