aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Dashjr <luke-jr+git@utopios.org>2012-11-29 03:35:55 +0000
committerLuke Dashjr <luke-jr+git@utopios.org>2012-11-29 03:35:55 +0000
commit6634e6dc42ebc399dc5cb27feee5c1e7b28db4e4 (patch)
treeaf930a5eaae54fea44056ec0e643afabe0692658
parent6d3d1b985f11d5fc102fe7e2d77c9f09131e7ea7 (diff)
parent3a72e91e3a94b87962aadbfbe555c88ed7029443 (diff)
downloadbitcoin-6634e6dc42ebc399dc5cb27feee5c1e7b28db4e4.tar.xz
Merge branch '0.6.0.x' into 0.6.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 d737657928..a8d9a57f7c 100644
--- a/src/bitcoinrpc.cpp
+++ b/src/bitcoinrpc.cpp
@@ -1509,7 +1509,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;
}