GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-16 13:01:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 66b08e7822 into merged_master (Bitcoin PR bitcoin/bitcoin#27302)

Browse source
This commit is contained in:
Byron Hambly 2025-06-23 15:41:44 +02:00
commit fe4599e9f0
11 changed files with 193 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/common/args.cpp
View file

@ -760,7 +760,8 @@ bool CheckDataDirOption(const ArgsManager& args)
fs::path ArgsManager::GetConfigFilePath() const
{
return GetConfigFile(*this, GetPathArg("-conf", BITCOIN_CONF_FILENAME));
LOCK(cs_args);
return *Assert(m_config_path);
}
ChainType ArgsManager::GetChainType() const