LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity

Merge pull request #4976

Browse source 
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
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"))