From 38f16334c13e895cbb2bb09cdcdbbddcc732aa4c Mon Sep 17 00:00:00 2001
From: blackjok3r <blackjok3r@gmail.com>
Date: Tue, 7 May 2019 22:42:12 +0800
Subject: [PATCH] fix

---
 src/cc/payments.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/cc/payments.cpp b/src/cc/payments.cpp
index 35eda45f3..f78474e12 100644
--- a/src/cc/payments.cpp
+++ b/src/cc/payments.cpp
@@ -575,8 +575,11 @@ int64_t AddPaymentsInputs(bool fLockedBlocks,int8_t GetBalance,struct CCcontract
                 }
                 if ( (nValue= IsPaymentsvout(cp,vintx,vout,coinaddr,ccopret)) > PAYMENTS_TXFEE && nValue >= threshold && myIsutxo_spentinmempool(ignoretxid,ignorevin,txid,vout) == 0 )
                 {
+                    int32_t offset = 0;
+                    if ( ccopret.size() > 2 && DecodePaymentsMergeOpRet(ccopret,checktxid) == 'M' )
+                        offset = PAYMENTS_MERGEOFSET;
                     int32_t tmpblocksleft = 0;
-                    if ( fLockedBlocks && !payments_lockedblocks(hashBlock, lockedblocks+(GetBalance == 4 ? PAYMENTS_MERGEOFSET : 0), tmpblocksleft) )
+                    if ( fLockedBlocks && !payments_lockedblocks(hashBlock, lockedblocks+offset, tmpblocksleft) )
                     {
                         blocksleft_balance.push_back(std::make_pair(tmpblocksleft,nValue));
                         continue;