[gui] reset addrProxy/addrSeparateProxyTor if colon char missing
If addrProxy or addrSeparateProxyTor do not have a colon in the string somewhere in the QSettings storage, then attempting to open the options dialog will cause the entire program to crash.
This commit is contained in:
parent
dbc4ae0396
commit
ce2418fa4c
1 changed files with 2 additions and 2 deletions
|
@ -124,7 +124,7 @@ void OptionsModel::Init(bool resetSettings)
|
||||||
|
|
||||||
if (!settings.contains("fUseProxy"))
|
if (!settings.contains("fUseProxy"))
|
||||||
settings.setValue("fUseProxy", false);
|
settings.setValue("fUseProxy", false);
|
||||||
if (!settings.contains("addrProxy"))
|
if (!settings.contains("addrProxy") || !settings.value("addrProxy").toString().contains(':'))
|
||||||
settings.setValue("addrProxy", "127.0.0.1:9050");
|
settings.setValue("addrProxy", "127.0.0.1:9050");
|
||||||
// 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() && !gArgs.SoftSetArg("-proxy", settings.value("addrProxy").toString().toStdString()))
|
if (settings.value("fUseProxy").toBool() && !gArgs.SoftSetArg("-proxy", settings.value("addrProxy").toString().toStdString()))
|
||||||
|
@ -134,7 +134,7 @@ void OptionsModel::Init(bool resetSettings)
|
||||||
|
|
||||||
if (!settings.contains("fUseSeparateProxyTor"))
|
if (!settings.contains("fUseSeparateProxyTor"))
|
||||||
settings.setValue("fUseSeparateProxyTor", false);
|
settings.setValue("fUseSeparateProxyTor", false);
|
||||||
if (!settings.contains("addrSeparateProxyTor"))
|
if (!settings.contains("addrSeparateProxyTor") || !settings.value("addrSeparateProxyTor").toString().contains(':'))
|
||||||
settings.setValue("addrSeparateProxyTor", "127.0.0.1:9050");
|
settings.setValue("addrSeparateProxyTor", "127.0.0.1:9050");
|
||||||
// Only try to set -onion, if user has enabled fUseSeparateProxyTor
|
// Only try to set -onion, if user has enabled fUseSeparateProxyTor
|
||||||
if (settings.value("fUseSeparateProxyTor").toBool() && !gArgs.SoftSetArg("-onion", settings.value("addrSeparateProxyTor").toString().toStdString()))
|
if (settings.value("fUseSeparateProxyTor").toBool() && !gArgs.SoftSetArg("-onion", settings.value("addrSeparateProxyTor").toString().toStdString()))
|
||||||
|
|
Loading…
Reference in a new issue