aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2014-07-09 08:47:09 +0200
committerWladimir J. van der Laan <laanwj@gmail.com>2014-07-09 08:47:16 +0200
commit2ee918d1214d0027285bb7558c237888d6ee175b (patch)
treea465859b8790ce00b7c54a5d8f8f712583ebe725 /src
parentf51816f42598924824019c6508dadbe697085b01 (diff)
parent509f926e80b3d24a6b6c6fbf535e4d4b97156a3c (diff)
Merge pull request #4275
509f926 Payment request parsing on startup now only changes network if a valid network name is specified. (Ross Nicoll)
Diffstat (limited to 'src')
-rw-r--r--src/qt/paymentserver.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/qt/paymentserver.cpp b/src/qt/paymentserver.cpp
index 5471625a67..7c0c95c459 100644
--- a/src/qt/paymentserver.cpp
+++ b/src/qt/paymentserver.cpp
@@ -214,9 +214,13 @@ bool PaymentServer::ipcParseCommandLine(int argc, char* argv[])
if (readPaymentRequest(arg, request))
{
if (request.getDetails().network() == "main")
+ {
SelectParams(CBaseChainParams::MAIN);
- else
+ }
+ else if (request.getDetails().network() == "test")
+ {
SelectParams(CBaseChainParams::TESTNET);
+ }
}
}
else