diff options
| author | Wladimir J. van der Laan <[email protected]> | 2014-03-10 09:22:20 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2014-03-10 09:31:19 +0100 |
| commit | fb4f40a0dc0d7126d5567befc6bcb7bdb381ea4d (patch) | |
| tree | 79723dc201067100af9a4606154f0ea2c7794ced /src/qt/bitcoin.cpp | |
| parent | Merge pull request #3796 (diff) | |
| parent | MainNet is the special case for the GUI (diff) | |
| download | discoin-fb4f40a0dc0d7126d5567befc6bcb7bdb381ea4d.tar.xz discoin-fb4f40a0dc0d7126d5567befc6bcb7bdb381ea4d.zip | |
Merge pull request #3823
89ec3a2 MainNet is the special case for the GUI (jtimon)
Diffstat (limited to 'src/qt/bitcoin.cpp')
| -rw-r--r-- | src/qt/bitcoin.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp index 162009f5d..652d39a5c 100644 --- a/src/qt/bitcoin.cpp +++ b/src/qt/bitcoin.cpp @@ -448,12 +448,12 @@ int main(int argc, char *argv[]) fSelParFromCLFailed = true; } #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)) exit(0); #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 |