BTCPrivate
/
BTCP-Rebase
mirror of https://github.com/BTCPrivate/BTCP-Rebase.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #3823 

89ec3a2 MainNet is the special case for the GUI (jtimon)
This commit is contained in:
Wladimir J. van der Laan 2014-03-10 09:22:20 +01:00
parent d33f69a447 89ec3a2911
commit fb4f40a0dc
No known key found for this signature in database
GPG Key ID: 74810B012346C9A6
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/qt/bitcoin.cpp
View File

@ -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