RPC: fix wallet lock check in privatesend start (#2102)

UdjinM6 · web-flow · commit fcac40ab4eda · 2018-06-11T13:13:03.000+03:00
diff --git a/src/rpc/masternode.cpp b/src/rpc/masternode.cpp
@@ -53,7 +53,8 @@ UniValue privatesend(const JSONRPCRequest& request)
     if(request.params[0].get_str() == "start") {
         {
             LOCK(pwalletMain->cs_wallet);
-            EnsureWalletIsUnlocked();
+            if (pwalletMain->IsLocked(true))
+                throw JSONRPCError(RPC_WALLET_UNLOCK_NEEDED, "Error: Please unlock wallet for mixing with walletpassphrase first.");
         }
 
         privateSendClient.fEnablePrivateSend = true;

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,8 @@ UniValue privatesend(const JSONRPCRequest& request)`
`53`	`53`	`if(request.params[0].get_str() == "start") {`
`54`	`54`	`{`
`55`	`55`	`LOCK(pwalletMain->cs_wallet);`
`56`		`- EnsureWalletIsUnlocked();`
	`56`	`+ if (pwalletMain->IsLocked(true))`
	`57`	`+ throw JSONRPCError(RPC_WALLET_UNLOCK_NEEDED, "Error: Please unlock wallet for mixing with walletpassphrase first.");`
`57`	`58`	`}`
`58`	`59`
`59`	`60`	`privateSendClient.fEnablePrivateSend = true;`