Merge pull request #4275

laanwj · laanwj · commit 2ee918d1214d · 2014-07-09T08:47:16.000+02:00
509f926 Payment request parsing on startup now only changes network if a valid network name is specified. (Ross Nicoll)
diff --git 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

Original file line number	Diff line number	Diff line change
`@@ -214,9 +214,13 @@ bool PaymentServer::ipcParseCommandLine(int argc, char* argv[])`
`214`	`214`	`if (readPaymentRequest(arg, request))`
`215`	`215`	`{`
`216`	`216`	`if (request.getDetails().network() == "main")`
	`217`	`+ {`
`217`	`218`	`SelectParams(CBaseChainParams::MAIN);`
`218`		`- else`
	`219`	`+ }`
	`220`	`+ else if (request.getDetails().network() == "test")`
	`221`	`+ {`
`219`	`222`	`SelectParams(CBaseChainParams::TESTNET);`
	`223`	`+ }`
`220`	`224`	`}`
`221`	`225`	`}`
`222`	`226`	`else`