highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-01-20 23:29:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '0.6.x' into 0.7.x

Browse Source 
Conflicts:
	src/bitcoinrpc.cpp
This commit is contained in:
Luke Dashjr
2012-11-29 03:36:23 +00:00
parent 0dba651def 6634e6dc42
commit d53af9c729
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/rpcwallet.cpp
View File

@@ -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;
}