From 3fdb9e8c159a2bc3ac853b469dae9ba0ecf739f3 Mon Sep 17 00:00:00 2001
From: jtimon <jtimon@blockstream.io>
Date: Mon, 1 Sep 2014 00:41:28 +0200
Subject: Remove CBaseChainParams::NetworkID()

---
 src/chainparams.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'src/chainparams.cpp')

diff --git a/src/chainparams.cpp b/src/chainparams.cpp
index 179db5a818..f561877d9f 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;
 }
-- 
cgit v1.2.3