diff options
| author | Jeff Garzik <jgarzik@exmulti.com> | 2011-08-31 09:32:42 -0700 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@exmulti.com> | 2011-08-31 09:32:42 -0700 |
| commit | 21189a42a735ff66166c17c53eb44998346059d6 (patch) | |
| tree | 2ebc2f714d8b55483eabaf2322c04fbf62457048 /src | |
| parent | 927aaa0f27463885ca97c76856044d948d4c36bb (diff) | |
| parent | 59ed5cb398f3817cebd8f5c6aeba3424de2acefe (diff) | |
| download | bitcoin-21189a42a735ff66166c17c53eb44998346059d6.tar.xz | |
Merge pull request #463 from TheBlueMatt/encreadme
Encryption readme update and minor rpc.cpp fixes
Diffstat (limited to 'src')
| -rw-r--r-- | src/rpc.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/rpc.cpp b/src/rpc.cpp index fdb57b3b83..62b2f82fb1 100644 --- a/src/rpc.cpp +++ b/src/rpc.cpp @@ -552,7 +552,7 @@ Value sendtoaddress(const Array& params, bool fHelp) CRITICAL_BLOCK(pwalletMain->cs_vMasterKey) { if(pwalletMain->IsLocked()) - throw JSONRPCError(-14, "Error: The wallet passphrase entered was incorrect."); + throw JSONRPCError(-13, "Error: Please enter the wallet passphrase with walletpassphrase first."); string strError = pwalletMain->SendMoneyToBitcoinAddress(address, nAmount, wtx); if (strError != "") @@ -827,7 +827,7 @@ Value sendfrom(const Array& params, bool fHelp) CRITICAL_BLOCK(pwalletMain->cs_vMasterKey) { if(pwalletMain->IsLocked()) - throw JSONRPCError(-14, "Error: The wallet passphrase entered was incorrect."); + throw JSONRPCError(-13, "Error: Please enter the wallet passphrase with walletpassphrase first."); // Check funds int64 nBalance = GetAccountBalance(strAccount, nMinDepth); @@ -894,7 +894,7 @@ Value sendmany(const Array& params, bool fHelp) CRITICAL_BLOCK(pwalletMain->cs_vMasterKey) { if(pwalletMain->IsLocked()) - throw JSONRPCError(-14, "Error: The wallet passphrase entered was incorrect."); + throw JSONRPCError(-13, "Error: Please enter the wallet passphrase with walletpassphrase first."); // Check funds int64 nBalance = GetAccountBalance(strAccount, nMinDepth); |