Merge 83112db129 into merged_master (Bitcoin PR #15864)

This commit is contained in:
Andrew Poelstra 2020-11-09 21:20:16 +00:00
commit a191197ace
7 changed files with 26 additions and 18 deletions

View file

@ -125,7 +125,7 @@ static int AppInitRPC(int argc, char* argv[])
}
return EXIT_SUCCESS;
}
if (!fs::is_directory(GetDataDir(false))) {
if (!CheckDataDirOption()) {
tfm::format(std::cerr, "Error: Specified data directory \"%s\" does not exist.\n", gArgs.GetArg("-datadir", "").c_str());
return EXIT_FAILURE;
}