sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-25 03:52:49 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge bitcoin-core/gui#568: options: flip listenonion to false if not listening

Browse Source 
7f90dc26c8938f348938929b6d8bf1ea6f149209 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: https://github.com/bitcoin-core/gui/issues/567

ACKs for top commit:
  mzumsande:
    Tested ACK 7f90dc26c8938f348938929b6d8bf1ea6f149209
  hebasto:
    ACK 7f90dc26c8938f348938929b6d8bf1ea6f149209
  jonatack:
    utACK 7f90dc26c8938f348938929b6d8bf1ea6f149209
  ryanofsky:
    Code review ACK 7f90dc26c8938f348938929b6d8bf1ea6f149209.

Tree-SHA512: ff5095096858eae696293dc58d1cd5bd1bb60ef7c5d07d87308a0cf71c67da88cc00b301b550704625f136c4ba3a29905a934a766535a6422fe85d9662299d32
This commit is contained in:
Hennadii Stepanov 2022-03-23 17:15:52 +01:00 committed by pasta
parent 200d2d58dc
commit 2e01c11146
No known key found for this signature in database
GPG Key ID: 52527BEDABE87984
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/qt/optionsmodel.cpp
View File

@ -266,8 +266,11 @@ 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())) if (!gArgs.SoftSetBoolArg("-listen", settings.value("fListen").toBool())) {
addOverriddenOption("-listen"); addOverriddenOption("-listen");
} else if (!settings.value("fListen").toBool()) {
gArgs.SoftSetBoolArg("-listenonion", false);
}
if (!settings.contains("fUseProxy")) if (!settings.contains("fUseProxy"))
settings.setValue("fUseProxy", false); settings.setValue("fUseProxy", false);