diff options
| author | Cory Fields <[email protected]> | 2014-09-24 21:53:19 -0400 |
|---|---|---|
| committer | Cory Fields <[email protected]> | 2014-09-25 17:47:32 -0400 |
| commit | 27c3e91014d65091b096b97680b95d1b130a284d (patch) | |
| tree | 1fa4e0927a9d59e1662395434db61e723687763c /src/qt/optionsmodel.cpp | |
| parent | Merge pull request #4955 (diff) | |
| download | discoin-27c3e91014d65091b096b97680b95d1b130a284d.tar.xz discoin-27c3e91014d65091b096b97680b95d1b130a284d.zip | |
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/qt/optionsmodel.cpp')
| -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 bd747faeb..21e390eb6 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")) |