Merge pull request #4976

27c3e91 qt: add proxy to options overridden if necessary. (Cory Fields)
10 years ago · 7c6cbff0e5
parent 2b5261c636 27c3e91014
commit 7c6cbff0e5
1 changed files with 2 additions and 0 deletions
--- 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"))