From 0173de95240baf2a77219cd93a7aad34d44adb86 Mon Sep 17 00:00:00 2001 From: jl777 Date: Tue, 6 Nov 2018 12:53:58 -1100 Subject: [PATCH] Remove mutex inside mutex --- src/cc/CCtx.cpp | 4 ++-- src/cc/dice.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/cc/CCtx.cpp b/src/cc/CCtx.cpp index cee9d3a81..29942377e 100644 --- a/src/cc/CCtx.cpp +++ b/src/cc/CCtx.cpp @@ -330,7 +330,7 @@ int64_t AddNormalinputs(CMutableTransaction &mtx,CPubKey mypk,int64_t total,int3 #ifdef ENABLE_WALLET const CKeyStore& keystore = *pwalletMain; assert(pwalletMain != NULL); - LOCK2(cs_main, pwalletMain->cs_wallet); + //LOCK2(cs_main, pwalletMain->cs_wallet); pwalletMain->AvailableCoins(vecOutputs, false, NULL, true); utxos = (struct CC_utxo *)calloc(maxutxos,sizeof(*utxos)); threshold = total/maxinputs; @@ -340,7 +340,7 @@ int64_t AddNormalinputs(CMutableTransaction &mtx,CPubKey mypk,int64_t total,int3 { txid = out.tx->GetHash(); vout = out.i; - if ( GetTransaction(txid,tx,hashBlock,false) != 0 && tx.vout.size() > 0 && vout < tx.vout.size() && tx.vout[vout].scriptPubKey.IsPayToCryptoCondition() == 0 ) + if ( myGetTransaction(txid,tx,hashBlock) != 0 && tx.vout.size() > 0 && vout < tx.vout.size() && tx.vout[vout].scriptPubKey.IsPayToCryptoCondition() == 0 ) { if ( out.tx->vout[out.i].nValue < threshold ) continue; diff --git a/src/cc/dice.cpp b/src/cc/dice.cpp index c26304092..bf36d48c1 100644 --- a/src/cc/dice.cpp +++ b/src/cc/dice.cpp @@ -1263,7 +1263,7 @@ double DiceStatus(uint64_t txfee,char *planstr,uint256 fundingtxid,uint256 bettx { fprintf(stderr,"("); mySenddicetransaction(res,entropyused,txid); - fprintf(stderr,"("); + fprintf(stderr,")"); n++; } else error = res; }