zcash-hackworks
/
zcash-patched-for-explorer
mirror of https://github.com/zcash-hackworks/zcash-patched-for-explorer.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #4976 

27c3e91 qt: add proxy to options overridden if necessary. (Cory Fields)
This commit is contained in:
Wladimir J. van der Laan 2014-10-07 12:32:49 +02:00
parent 2b5261c636 27c3e91014
commit 7c6cbff0e5
No known key found for this signature in database
GPG Key ID: 74810B012346C9A6
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/qt/optionsmodel.cpp
View File

@ -119,6 +119,8 @@ void OptionsModel::Init()
// Only try to set -proxy, if user has enabled fUseProxy
if (settings.value("fUseProxy").toBool() && !SoftSetArg("-proxy", settings.value("addrProxy").toString().toStdString()))
addOverriddenOption("-proxy");
else if(!settings.value("fUseProxy").toBool() && !GetArg("-proxy", "").empty())
addOverriddenOption("-proxy");
// Display
if (!settings.contains("language"))