Merge branch 'master' into beta

2018-09-24 05:09:14 -11:00
parent b9281f45e7 12832b1d22
commit 49adb58081
4 changed files with 26 additions and 6 deletions
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -5323,7 +5323,10 @@ UniValue dicebet(const UniValue& params, bool fHelp)
    }
    if (amount > 0 && odds > 0) {
        hex = DiceBet(0,name,fundingtxid,amount,odds);
-        if ( hex.size() > 0 )
+        if ( CCerror != "" )
+        {
+            ERR_RESULT(CCerror);
+        } else if ( hex.size() > 0 )
        {
            result.push_back(Pair("result", "success"));
            result.push_back(Pair("hex", hex));