Merge branch '0.6.x' into 0.7.x

Conflicts: src/bitcoinrpc.cpp
gdoteof · Nov 29, 2012 · d53af9c · d53af9c
2 parents 0dba651 + 6634e6d
commit d53af9c
Showing 1 changed file with 2 additions and 1 deletion.
diff --git 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;
 }