Browse Source

Merge pull request #4976

27c3e91 qt: add proxy to options overridden if necessary. (Cory Fields)
pull/1/head
Wladimir J. van der Laan 8 years ago
parent
commit
7c6cbff0e5
No known key found for this signature in database
GPG Key ID: 74810B012346C9A6
  1. 2
      src/qt/optionsmodel.cpp

2
src/qt/optionsmodel.cpp

@ -119,6 +119,8 @@ void OptionsModel::Init() @@ -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"))

Loading…
Cancel
Save