diff options
Diffstat (limited to 'src/bitcoind.cpp')
-rw-r--r-- | src/bitcoind.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/bitcoind.cpp b/src/bitcoind.cpp index bc23cf5507..02e4e7d6e7 100644 --- a/src/bitcoind.cpp +++ b/src/bitcoind.cpp @@ -39,10 +39,15 @@ bool AppInit(int argc, char* argv[]) ParseParameters(argc, argv); if (!boost::filesystem::is_directory(GetDataDir(false))) { - fprintf(stderr, "Error: Specified directory does not exist\n"); - Shutdown(); + fprintf(stderr, "Error: Specified data directory \"%s\" does not exist.\n", mapArgs["-datadir"].c_str()); + return false; } ReadConfigFile(mapArgs, mapMultiArgs); + // Check for -testnet or -regtest parameter (TestNet() calls are only valid after this clause) + if (!SelectParamsFromCommandLine()) { + fprintf(stderr, "Error: Invalid combination of -regtest and -testnet.\n"); + return false; + } if (mapArgs.count("-?") || mapArgs.count("--help")) { @@ -67,14 +72,10 @@ bool AppInit(int argc, char* argv[]) if (fCommandLine) { - if (!SelectParamsFromCommandLine()) { - fprintf(stderr, "Error: invalid combination of -regtest and -testnet.\n"); - return false; - } int ret = CommandLineRPC(argc, argv); exit(ret); } -#if !defined(WIN32) +#ifndef WIN32 fDaemon = GetBoolArg("-daemon", false); if (fDaemon) { |