From a2189fbaf65dd56c808dc7429b800e70d31178c3 Mon Sep 17 00:00:00 2001 From: Philip Kaufmann Date: Sun, 23 Jun 2013 18:04:44 +0200 Subject: 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 --- src/init.cpp | 3 --- 1 file changed, 3 deletions(-) (limited to 'src/init.cpp') diff --git a/src/init.cpp b/src/init.cpp index 7182c1414..64a5de239 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 -- cgit v1.2.3