Merge pull request #3823
89ec3a2
MainNet is the special case for the GUI (jtimon)
This commit is contained in:
commit
fb4f40a0dc
1 changed files with 2 additions and 2 deletions
|
@ -448,12 +448,12 @@ int main(int argc, char *argv[])
|
||||||
fSelParFromCLFailed = true;
|
fSelParFromCLFailed = true;
|
||||||
}
|
}
|
||||||
#ifdef ENABLE_WALLET
|
#ifdef ENABLE_WALLET
|
||||||
// Parse URIs on command line -- this can affect TestNet() / RegTest() mode
|
// Parse URIs on command line -- this can affect Params()
|
||||||
if (!PaymentServer::ipcParseCommandLine(argc, argv))
|
if (!PaymentServer::ipcParseCommandLine(argc, argv))
|
||||||
exit(0);
|
exit(0);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
bool isaTestNet = TestNet() || RegTest();
|
bool isaTestNet = Params().NetworkID() != CChainParams::MAIN;
|
||||||
|
|
||||||
// Do not refer to data directory yet, this can be overridden by Intro::pickDataDirectory
|
// Do not refer to data directory yet, this can be overridden by Intro::pickDataDirectory
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue