|
|
@ -151,9 +151,26 @@ void OptionsModel::Init(bool resetSettings)
|
|
|
|
|
|
|
|
|
|
|
|
if (!settings.contains("fListen"))
|
|
|
|
if (!settings.contains("fListen"))
|
|
|
|
settings.setValue("fListen", DEFAULT_LISTEN);
|
|
|
|
settings.setValue("fListen", DEFAULT_LISTEN);
|
|
|
|
if (!gArgs.SoftSetBoolArg("-listen", settings.value("fListen").toBool())) {
|
|
|
|
const bool listen{settings.value("fListen").toBool()};
|
|
|
|
|
|
|
|
if (!gArgs.SoftSetBoolArg("-listen", listen)) {
|
|
|
|
addOverriddenOption("-listen");
|
|
|
|
addOverriddenOption("-listen");
|
|
|
|
} else if (!settings.value("fListen").toBool()) {
|
|
|
|
} else if (!listen) {
|
|
|
|
|
|
|
|
// We successfully set -listen=0, thus mimic the logic from InitParameterInteraction():
|
|
|
|
|
|
|
|
// "parameter interaction: -listen=0 -> setting -listenonion=0".
|
|
|
|
|
|
|
|
//
|
|
|
|
|
|
|
|
// Both -listen and -listenonion default to true.
|
|
|
|
|
|
|
|
//
|
|
|
|
|
|
|
|
// The call order is:
|
|
|
|
|
|
|
|
//
|
|
|
|
|
|
|
|
// InitParameterInteraction()
|
|
|
|
|
|
|
|
// would set -listenonion=0 if it sees -listen=0, but for bitcoin-qt with
|
|
|
|
|
|
|
|
// fListen=false -listen is 1 at this point
|
|
|
|
|
|
|
|
//
|
|
|
|
|
|
|
|
// OptionsModel::Init()
|
|
|
|
|
|
|
|
// (this method) can flip -listen from 1 to 0 if fListen=false
|
|
|
|
|
|
|
|
//
|
|
|
|
|
|
|
|
// AppInitParameterInteraction()
|
|
|
|
|
|
|
|
// raises an error if -listen=0 and -listenonion=1
|
|
|
|
gArgs.SoftSetBoolArg("-listenonion", false);
|
|
|
|
gArgs.SoftSetBoolArg("-listenonion", false);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|