aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Dashjr <luke-jr+git@utopios.org>2012-11-29 03:36:23 +0000
committerLuke Dashjr <luke-jr+git@utopios.org>2012-11-29 03:36:23 +0000
commitd53af9c729dedddfce575c21c837900bae41ba68 (patch)
tree8741319f18292aabaeafd2451d79128d9acc4922
parent0dba651def56ccf6f2bf78ac9cc9e6edf97bc668 (diff)
parent6634e6dc42ebc399dc5cb27feee5c1e7b28db4e4 (diff)
Merge branch '0.6.x' into 0.7.xv0.7.2rc2
Conflicts: src/bitcoinrpc.cpp
-rw-r--r--src/rpcwallet.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/rpcwallet.cpp b/src/rpcwallet.cpp
index 9e914f336d..0d59fa364e 100644
--- a/src/rpcwallet.cpp
+++ b/src/rpcwallet.cpp
@@ -1195,7 +1195,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;
}