diff options
| author | Pieter Wuille <[email protected]> | 2013-06-22 06:56:14 -0700 |
|---|---|---|
| committer | Pieter Wuille <[email protected]> | 2013-06-22 06:56:14 -0700 |
| commit | 01b45731b75a19ac194b4206b20716bfedcb2357 (patch) | |
| tree | 90bd76e552d0ac7b44382885e212d9705fe24d96 /src/bitcoind.cpp | |
| parent | Merge pull request #2781 from sipa/keytimemem (diff) | |
| parent | Introduce a CChainParameters singleton class and regtest mode. (diff) | |
| download | discoin-01b45731b75a19ac194b4206b20716bfedcb2357.tar.xz discoin-01b45731b75a19ac194b4206b20716bfedcb2357.zip | |
Merge pull request #2632 from mikehearn/chainparams
Refactor chain-specific tweaks into a CChainParams class and introduce a regtest mode
Diffstat (limited to 'src/bitcoind.cpp')
| -rw-r--r-- | src/bitcoind.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/bitcoind.cpp b/src/bitcoind.cpp index 682a214fb..bc23cf550 100644 --- a/src/bitcoind.cpp +++ b/src/bitcoind.cpp @@ -67,6 +67,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); } |