diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-10-07 12:32:49 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-10-07 12:33:45 +0200 |
| commit | 7c6cbff0e52d4b69fd823426341a4d62d29b2c16 (patch) | |
| tree | 5a1d4b5db424f3ac4a12f7cf011d93a51d5acafe /src | |
| parent | 2b5261c63690fd545a8dcf742e32ed1bb519183a (diff) | |
| parent | 27c3e91014d65091b096b97680b95d1b130a284d (diff) | |
| download | bitcoin-7c6cbff0e52d4b69fd823426341a4d62d29b2c16.tar.xz | |
Merge pull request #4976
27c3e91 qt: add proxy to options overridden if necessary. (Cory Fields)
Diffstat (limited to 'src')
| -rw-r--r-- | src/qt/optionsmodel.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/qt/optionsmodel.cpp b/src/qt/optionsmodel.cpp index cb80bd0e3d..6db654dff7 100644 --- a/src/qt/optionsmodel.cpp +++ b/src/qt/optionsmodel.cpp @@ -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")) |