Skip to content

Commit f9ed0ae

Browse files
committed
Merge #568: options: flip listenonion to false if not listening
7f90dc2 options: flip listenonion to false if not listening (Vasil Dimov) Pull request description: If the user has unchecked "Allow incoming connections" in `Settings->Options...->Network` then `fListen=false` is saved in `~/.config/Bitcoin/Bitcoin-Qt.conf`. This flips `-listen` to `false` during startup, but leaves `-listenonion` to `true`. This flipping of `-listen` is done in `OptionsModel::Init()` after `InitParameterInteraction()` has been executed which would have flipped `-listenonion`, should it have seen `-listen` being `false` (this is a difference between `bitcoind` and `bitcoin-qt`). Fixes: #567 ACKs for top commit: mzumsande: Tested ACK 7f90dc2 hebasto: ACK 7f90dc2 jonatack: utACK 7f90dc2 ryanofsky: Code review ACK 7f90dc2. Tree-SHA512: ff5095096858eae696293dc58d1cd5bd1bb60ef7c5d07d87308a0cf71c67da88cc00b301b550704625f136c4ba3a29905a934a766535a6422fe85d9662299d32
2 parents bc562b9 + 7f90dc2 commit f9ed0ae

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

src/qt/optionsmodel.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,8 +151,11 @@ void OptionsModel::Init(bool resetSettings)
151151

152152
if (!settings.contains("fListen"))
153153
settings.setValue("fListen", DEFAULT_LISTEN);
154-
if (!gArgs.SoftSetBoolArg("-listen", settings.value("fListen").toBool()))
154+
if (!gArgs.SoftSetBoolArg("-listen", settings.value("fListen").toBool())) {
155155
addOverriddenOption("-listen");
156+
} else if (!settings.value("fListen").toBool()) {
157+
gArgs.SoftSetBoolArg("-listenonion", false);
158+
}
156159

157160
if (!settings.contains("server")) {
158161
settings.setValue("server", false);

0 commit comments

Comments
 (0)