diff options
| author | Philip Kaufmann <phil.kaufmann@t-online.de> | 2013-06-23 18:04:44 +0200 |
|---|---|---|
| committer | Gavin Andresen <gavinandresen@gmail.com> | 2013-08-22 11:05:45 +1000 |
| commit | a2189fbaf65dd56c808dc7429b800e70d31178c3 (patch) | |
| tree | 3a9e6d8fcb69d25f2e9f6f1091252367137f056c /src/init.cpp | |
| parent | 3624356e82015c980fa7b7e60dfbe128665b1952 (diff) | |
| download | bitcoin-a2189fbaf65dd56c808dc7429b800e70d31178c3.tar.xz | |
update SelectParamsFromCommandLine() handling/order
- move SelectParamsFromCommandLine() from init.cpp to bitcoin.cpp to allow
to use TestNet() for Bitcoin-Qt instead of GetBoolArg("-testnet", false)
- change order in bitcoind.cpp to match bitcoin.cpp functionality
- hamonize error message strings for missing datadir and failing
SelectParamsFromCommandLine() in bitcoin.cpp and bitcoind.cpp
- use TestNet() call in splashscreen.cpp
Diffstat (limited to 'src/init.cpp')
| -rw-r--r-- | src/init.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/init.cpp b/src/init.cpp index 7182c14146..64a5de239f 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -373,9 +373,6 @@ bool AppInit2(boost::thread_group& threadGroup) // ********************************************************* Step 2: parameter interactions Checkpoints::fEnabled = GetBoolArg("-checkpoints", true); - if (!SelectParamsFromCommandLine()) { - return InitError("Invalid combination of -testnet and -regtest."); - } if (mapArgs.count("-bind")) { // when specifying an explicit binding address, you want to listen on it |