aboutsummaryrefslogtreecommitdiff
path: root/src/chainparams.cpp
diff options
context:
space:
mode:
authorjtimon <[email protected]>2014-09-01 00:41:28 +0200
committerjtimon <[email protected]>2014-09-21 21:25:15 +0200
commit3fdb9e8c159a2bc3ac853b469dae9ba0ecf739f3 (patch)
treed4780d7151553c06d7fc4666465dcc5c02dbf409 /src/chainparams.cpp
parentReserve only one network specific cached path per session (diff)
downloaddiscoin-3fdb9e8c159a2bc3ac853b469dae9ba0ecf739f3.tar.xz
discoin-3fdb9e8c159a2bc3ac853b469dae9ba0ecf739f3.zip
Remove CBaseChainParams::NetworkID()
Diffstat (limited to 'src/chainparams.cpp')
-rw-r--r--src/chainparams.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/chainparams.cpp b/src/chainparams.cpp
index 179db5a81..f561877d9 100644
--- a/src/chainparams.cpp
+++ b/src/chainparams.cpp
@@ -240,10 +240,13 @@ void SelectParams(CBaseChainParams::Network network) {
pCurrentParams = &Params(network);
}
-bool SelectParamsFromCommandLine() {
- if (!SelectBaseParamsFromCommandLine())
+bool SelectParamsFromCommandLine()
+{
+ CBaseChainParams::Network network = CBaseChainParams::NetworkIdFromCommandLine();
+ if (network == CBaseChainParams::MAX_NETWORK_TYPES)
return false;
- SelectParams(BaseParams().NetworkID());
+ SelectBaseParams(network);
+ SelectParams(network);
return true;
}