Merge branch 'beta' into dev

2018-09-24 05:49:30 -11:00
parent 17b55502e5 49adb58081
commit a5a8968a32
5 changed files with 30 additions and 6 deletions
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -6050,7 +6050,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));