diff options
| author | Jorge Timón <jtimon@jtimon.cc> | 2015-05-25 09:00:17 +0200 |
|---|---|---|
| committer | Jorge Timón <jtimon@jtimon.cc> | 2015-10-20 14:28:43 +0200 |
| commit | 55a89751faaada5598771d10401030e9e86eecbd (patch) | |
| tree | 87607d31265c50db8955f805d280faeb8e82ab03 /src/qt | |
| parent | f3525e24e3a156eaa004ca28a59fe2d449dc1f9e (diff) | |
| download | bitcoin-55a89751faaada5598771d10401030e9e86eecbd.tar.xz | |
Chainparams: Translations: DRY: options and error strings
Also remove SelectBaseParamsFromCommandLine and SelectParamsFromCommandLine
Diffstat (limited to 'src/qt')
| -rw-r--r-- | src/qt/bitcoin.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp index 1da2d3e344..c6bb7112e1 100644 --- a/src/qt/bitcoin.cpp +++ b/src/qt/bitcoin.cpp @@ -604,8 +604,10 @@ int main(int argc, char *argv[]) // - Needs to be done before createOptionsModel // Check for -testnet or -regtest parameter (Params() calls are only valid after this clause) - if (!SelectParamsFromCommandLine()) { - QMessageBox::critical(0, QObject::tr("Bitcoin Core"), QObject::tr("Error: Invalid combination of -regtest and -testnet.")); + try { + SelectParams(ChainNameFromCommandLine()); + } catch(std::exception &e) { + QMessageBox::critical(0, QObject::tr("Bitcoin Core"), QObject::tr("Error: %1").arg(e.what())); return 1; } #ifdef ENABLE_WALLET |