|
|
@ -531,14 +531,14 @@ int main(int argc, char *argv[]) |
|
|
|
/// - Do not call GetDataDir(true) before this step finishes
|
|
|
|
/// - Do not call GetDataDir(true) before this step finishes
|
|
|
|
if (!boost::filesystem::is_directory(GetDataDir(false))) |
|
|
|
if (!boost::filesystem::is_directory(GetDataDir(false))) |
|
|
|
{ |
|
|
|
{ |
|
|
|
QMessageBox::critical(0, QObject::tr("Bitcoin"), |
|
|
|
QMessageBox::critical(0, QObject::tr("Bitcoin Core"), |
|
|
|
QObject::tr("Error: Specified data directory \"%1\" does not exist.").arg(QString::fromStdString(mapArgs["-datadir"]))); |
|
|
|
QObject::tr("Error: Specified data directory \"%1\" does not exist.").arg(QString::fromStdString(mapArgs["-datadir"]))); |
|
|
|
return 1; |
|
|
|
return 1; |
|
|
|
} |
|
|
|
} |
|
|
|
try { |
|
|
|
try { |
|
|
|
ReadConfigFile(mapArgs, mapMultiArgs); |
|
|
|
ReadConfigFile(mapArgs, mapMultiArgs); |
|
|
|
} catch(std::exception &e) { |
|
|
|
} catch(std::exception &e) { |
|
|
|
QMessageBox::critical(0, QObject::tr("Bitcoin"), |
|
|
|
QMessageBox::critical(0, QObject::tr("Bitcoin Core"), |
|
|
|
QObject::tr("Error: Cannot parse configuration file: %1. Only use key=value syntax.").arg(e.what())); |
|
|
|
QObject::tr("Error: Cannot parse configuration file: %1. Only use key=value syntax.").arg(e.what())); |
|
|
|
return false; |
|
|
|
return false; |
|
|
|
} |
|
|
|
} |
|
|
@ -551,7 +551,7 @@ int main(int argc, char *argv[]) |
|
|
|
|
|
|
|
|
|
|
|
// Check for -testnet or -regtest parameter (Params() calls are only valid after this clause)
|
|
|
|
// Check for -testnet or -regtest parameter (Params() calls are only valid after this clause)
|
|
|
|
if (!SelectParamsFromCommandLine()) { |
|
|
|
if (!SelectParamsFromCommandLine()) { |
|
|
|
QMessageBox::critical(0, QObject::tr("Bitcoin"), QObject::tr("Error: Invalid combination of -regtest and -testnet.")); |
|
|
|
QMessageBox::critical(0, QObject::tr("Bitcoin Core"), QObject::tr("Error: Invalid combination of -regtest and -testnet.")); |
|
|
|
return 1; |
|
|
|
return 1; |
|
|
|
} |
|
|
|
} |
|
|
|
#ifdef ENABLE_WALLET |
|
|
|
#ifdef ENABLE_WALLET |
|
|
|