Merge 9eaef10801 into merged_master (Bitcoin PR bitcoin/bitcoin#25707)

This commit is contained in:
Byron Hambly 2024-11-04 11:26:40 +02:00
commit 1006327a13
28 changed files with 43 additions and 39 deletions

View file

@ -1121,7 +1121,7 @@ bool AppInitParameterInteraction(const ArgsManager& args, bool use_syscall_sandb
static bool LockDataDirectory(bool probeOnly)
{
// Make sure only a single Bitcoin process is using the data directory.
fs::path datadir = gArgs.GetDataDirNet();
const fs::path& datadir = gArgs.GetDataDirNet();
if (!DirIsWritable(datadir)) {
return InitError(strprintf(_("Cannot write to data directory '%s'; check permissions."), fs::PathToString(datadir)));
}