diff --git a/src/interfaces/node.cpp b/src/interfaces/node.cpp --- a/src/interfaces/node.cpp +++ b/src/interfaces/node.cpp @@ -134,7 +134,7 @@ LOCK(::cs_main); tip = ::chainActive.Tip(); } - return GuessVerificationProgress(::Params().TxData(), tip); + return GuessVerificationProgress(Params().TxData(), tip); } bool isInitialBlockDownload() override { return IsInitialBlockDownload(); @@ -189,7 +189,7 @@ return MakeHandler(::uiInterface.NotifyBlockTip.connect( [fn](bool initial_download, const CBlockIndex *block) { fn(initial_download, block->nHeight, block->GetBlockTime(), - GuessVerificationProgress(::Params().TxData(), block)); + GuessVerificationProgress(Params().TxData(), block)); })); } std::unique_ptr @@ -197,7 +197,7 @@ return MakeHandler(::uiInterface.NotifyHeaderTip.connect( [fn](bool initial_download, const CBlockIndex *block) { fn(initial_download, block->nHeight, block->GetBlockTime(), - GuessVerificationProgress(::Params().TxData(), block)); + GuessVerificationProgress(Params().TxData(), block)); })); } }; diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp --- a/src/qt/bitcoin.cpp +++ b/src/qt/bitcoin.cpp @@ -656,7 +656,7 @@ /// 5. Now that settings and translations are available, ask user for data /// directory. User language is set up: pick a data directory. - if (!Intro::pickDataDirectory()) { + if (!Intro::pickDataDirectory(*node)) { return EXIT_SUCCESS; } diff --git a/src/qt/intro.h b/src/qt/intro.h --- a/src/qt/intro.h +++ b/src/qt/intro.h @@ -13,6 +13,10 @@ class FreespaceChecker; +namespace interfaces { +class Node; +} + namespace Ui { class Intro; } @@ -42,7 +46,7 @@ * @note do NOT call global GetDataDir() before calling this function, this * will cause the wrong path to be cached. */ - static bool pickDataDirectory(); + static bool pickDataDirectory(interfaces::Node &node); /** * Determine default data directory for operating system. diff --git a/src/qt/intro.cpp b/src/qt/intro.cpp --- a/src/qt/intro.cpp +++ b/src/qt/intro.cpp @@ -8,6 +8,7 @@ #include "fs.h" #include "guiutil.h" +#include "interfaces/node.h" #include "intro.h" #include "ui_intro.h" #include "util.h" @@ -161,7 +162,7 @@ return GUIUtil::boostPathToQString(GetDefaultDataDir()); } -bool Intro::pickDataDirectory() { +bool Intro::pickDataDirectory(interfaces::Node &node) { QSettings settings; /* If data directory provided on command line, no need to look at settings or show a picking dialog */ @@ -215,8 +216,8 @@ */ if (dataDir != getDefaultDataDirectory()) { // use OS locale for path setting - gArgs.SoftSetArg("-datadir", - GUIUtil::qstringToBoostPath(dataDir).string()); + node.softSetArg("-datadir", + GUIUtil::qstringToBoostPath(dataDir).string()); } return true; }