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

Merge 45952dab9d into merged_master (Bitcoin PR #20932)

Browse source
This commit is contained in:
Andrew Poelstra 2021-06-18 15:00:45 +00:00
commit 76075ee96a
9 changed files with 45 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/util/system.cpp
View file

@ -386,7 +386,7 @@ bool ArgsManager::GetSettingsPath(fs::path* filepath, bool temp) const
}
if (filepath) {
std::string settings = GetArg("-settings", BITCOIN_SETTINGS_FILENAME);
*filepath = fs::absolute(temp ? settings + ".tmp" : settings, GetDataDir(/* net_specific= */ true));
*filepath = fsbridge::AbsPathJoin(GetDataDir(/* net_specific= */ true), temp ? settings + ".tmp" : settings);
}
return true;
}
@ -1331,7 +1331,7 @@ fs::path AbsPathForConfigVal(const fs::path& path, bool net_specific)
if (path.is_absolute()) {
return path;
}
return fs::absolute(path, GetDataDir(net_specific));
return fsbridge::AbsPathJoin(GetDataDir(net_specific), path);
}
void ScheduleBatchPriority()