aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Dashjr <luke-jr+git@utopios.org>2012-11-29 03:35:44 +0000
committerLuke Dashjr <luke-jr+git@utopios.org>2012-11-29 03:35:44 +0000
commit3a72e91e3a94b87962aadbfbe555c88ed7029443 (patch)
tree04f71dd1100fdea7ce57a80f566c58144a9159e6
parentc3f45b444951b6f752d68876cf9392402a55f080 (diff)
parent72c81665897264953ec0ab2b15894aee3432ab81 (diff)
downloadbitcoin-3a72e91e3a94b87962aadbfbe555c88ed7029443.tar.xz
Merge branch '0.5.x' into 0.6.0.x
-rw-r--r--src/bitcoinrpc.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/bitcoinrpc.cpp b/src/bitcoinrpc.cpp
index 8899b11831..b0bd25bf83 100644
--- a/src/bitcoinrpc.cpp
+++ b/src/bitcoinrpc.cpp
@@ -1511,7 +1511,8 @@ Value backupwallet(const Array& params, bool fHelp)
"Safely copies wallet.dat to destination, which can be a directory or a path with filename.");
string strDest = params[0].get_str();
- BackupWallet(*pwalletMain, strDest);
+ if (!BackupWallet(*pwalletMain, strDest))
+ throw JSONRPCError(RPC_WALLET_ERROR, "Error: Wallet backup failed!");
return Value::null;
}