Merge pull request #4623

e84843c Broken addresses on command line no longer trigger testnet. (Ross Nicoll)
2014-09-10 14:29:16 +02:00
parent fd1caa0961 e84843c0db
commit f23869e14b
5 changed files with 26 additions and 13 deletions
--- a/src/qt/paymentserver.cpp
+++ b/src/qt/paymentserver.cpp
@@ -10,6 +10,7 @@
 #include "optionsmodel.h"

 #include "base58.h"
+#include "chainparams.h"
 #include "ui_interface.h"
 #include "util.h"
 #include "wallet.h"
@@ -200,8 +201,11 @@ bool PaymentServer::ipcParseCommandLine(int argc, char* argv[])
            {
                CBitcoinAddress address(r.address.toStdString());

-                SelectParams(CBaseChainParams::MAIN);
-                if (!address.IsValid())
+                if (address.IsValid(Params(CBaseChainParams::MAIN)))
+                {
+                    SelectParams(CBaseChainParams::MAIN);
+                }
+                else if (address.IsValid(Params(CBaseChainParams::TESTNET)))
                {
                    SelectParams(CBaseChainParams::TESTNET);
                }