Merge #11448: [gui] reset addrProxy/addrSeparateProxyTor if colon char missing
ce2418f
[gui] reset addrProxy/addrSeparateProxyTor if colon char missing (Cristian Mircea Messel)
Pull request description:
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.
Fixes #11209
Tree-SHA512: 2d9e6987cf05af3f41033290b61d00920f7fe4a65bea7efd96ed417a8ca7866d248f091e09947cc8aad3a6a4aa8b7777211cfff7f379a62188be50df2c46d4b2
This commit is contained in:
commit
d473e6ddc5
1 changed files with 2 additions and 2 deletions
|
@ -124,7 +124,7 @@ void OptionsModel::Init(bool resetSettings)
|
|||
|
||||
if (!settings.contains("fUseProxy"))
|
||||
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");
|
||||
// Only try to set -proxy, if user has enabled fUseProxy
|
||||
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"))
|
||||
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");
|
||||
// Only try to set -onion, if user has enabled fUseSeparateProxyTor
|
||||
if (settings.value("fUseSeparateProxyTor").toBool() && !gArgs.SoftSetArg("-onion", settings.value("addrSeparateProxyTor").toString().toStdString()))
|
||||
|
|
Loading…
Reference in a new issue