diff options
| author | Cory Fields <cory-nospam-@coryfields.com> | 2014-09-24 21:53:19 -0400 |
|---|---|---|
| committer | Cory Fields <cory-nospam-@coryfields.com> | 2014-09-25 17:47:32 -0400 |
| commit | 27c3e91014d65091b096b97680b95d1b130a284d (patch) | |
| tree | 1fa4e0927a9d59e1662395434db61e723687763c /src | |
| parent | 7a04f3d708faab4af1f1a6aeddc5a6a4db3849a5 (diff) | |
| download | bitcoin-27c3e91014d65091b096b97680b95d1b130a284d.tar.xz | |
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.
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 bd747faeb6..21e390eb6d 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")) |