Merge 11f68cc810 into merged_master (Bitcoin PR bitcoin/bitcoin#31212)

This commit is contained in:
ivanlele 2026-04-08 12:06:36 +00:00
commit 5eec58e762
No known key found for this signature in database
16 changed files with 210 additions and 75 deletions

View file

@ -135,10 +135,10 @@ static bool ParseArgs(NodeContext& node, int argc, char* argv[])
static bool ProcessInitCommands(ArgsManager& args)
{
// Process help and version before taking care about datadir
if (HelpRequested(args) || args.IsArgSet("-version")) {
if (HelpRequested(args) || args.GetBoolArg("-version", false)) {
std::string strUsage = CLIENT_NAME " daemon version " + FormatFullVersion() + "\n";
if (args.IsArgSet("-version")) {
if (args.GetBoolArg("-version", false)) {
strUsage += FormatParagraph(LicenseInfo());
} else {
strUsage += "\n"