diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-10-17 08:47:11 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-10-17 08:47:11 +0200 |
| commit | 494ff05a4cd9d89857342d5c843ed480afcc8fe7 (patch) | |
| tree | dbab4f9ea8dfe172b9766b3df0b7cb87ea908b53 /src/chainparams.cpp | |
| parent | c2fc9729d15a6a9b1888ec03daef38cf1e2740a9 (diff) | |
| parent | ca3ce0fa037a94f2c357ad04d42e5f526cbcb78e (diff) | |
| download | bitcoin-494ff05a4cd9d89857342d5c843ed480afcc8fe7.tar.xz | |
Merge pull request #4804 from jtimon/chainparams3
Remove CBaseChainParams::NetworkID()
Diffstat (limited to 'src/chainparams.cpp')
| -rw-r--r-- | src/chainparams.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/chainparams.cpp b/src/chainparams.cpp index f2a14b8293..dfb4c59d87 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -354,10 +354,13 @@ void SelectParams(CBaseChainParams::Network network) { pCurrentParams = &Params(network); } -bool SelectParamsFromCommandLine() { - if (!SelectBaseParamsFromCommandLine()) +bool SelectParamsFromCommandLine() +{ + CBaseChainParams::Network network = NetworkIdFromCommandLine(); + if (network == CBaseChainParams::MAX_NETWORK_TYPES) return false; - SelectParams(BaseParams().NetworkID()); + SelectBaseParams(network); + SelectParams(network); return true; } |