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.
This commit is contained in:
parent
7a04f3d708
commit
27c3e91014
|
@ -119,6 +119,8 @@ void OptionsModel::Init()
|
||||||
// Only try to set -proxy, if user has enabled fUseProxy
|
// Only try to set -proxy, if user has enabled fUseProxy
|
||||||
if (settings.value("fUseProxy").toBool() && !SoftSetArg("-proxy", settings.value("addrProxy").toString().toStdString()))
|
if (settings.value("fUseProxy").toBool() && !SoftSetArg("-proxy", settings.value("addrProxy").toString().toStdString()))
|
||||||
addOverriddenOption("-proxy");
|
addOverriddenOption("-proxy");
|
||||||
|
else if(!settings.value("fUseProxy").toBool() && !GetArg("-proxy", "").empty())
|
||||||
|
addOverriddenOption("-proxy");
|
||||||
|
|
||||||
// Display
|
// Display
|
||||||
if (!settings.contains("language"))
|
if (!settings.contains("language"))
|
||||||
|
|
Loading…
Reference in New Issue