aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Dashjr <luke-jr+git@utopios.org>2012-11-29 03:35:35 +0000
committerLuke Dashjr <luke-jr+git@utopios.org>2012-11-29 03:35:35 +0000
commit72c81665897264953ec0ab2b15894aee3432ab81 (patch)
treee8c805343bcf25bdae097cdcd0760da649bdaffc
parent506061360a9f00edf1656dc2ae9d08d7700f0072 (diff)
parent2a9301b75a0ea106b0a347e9aa2d9e535a9e8029 (diff)
downloadbitcoin-72c81665897264953ec0ab2b15894aee3432ab81.tar.xz
Merge branch '0.4.x' into 0.5.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 af75bc44a4..373994d43f 100644
--- a/src/bitcoinrpc.cpp
+++ b/src/bitcoinrpc.cpp
@@ -1385,7 +1385,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;
}