Merge branch 'Blackcoin-Lore' of https://github.com/janko33bd/bitcoin.git into Blackcoin-Lore

2018-02-05 20:22:54 +01:00
parent e38ecb6e08 cf64fa85a9
commit 5df3672ddb
1 changed files with 1 additions and 2 deletions
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -1814,8 +1814,7 @@ void CWallet::ReacceptWalletTransactions()
        assert(wtx.GetHash() == wtxid);

        int nDepth = wtx.GetDepthInMainChain();
-
-        if (!wtx.IsCoinBase() && !wtx.IsCoinStake() && (nDepth == 0 && !wtx.isAbandoned() && (IsMine(wtx) || IsFromMe(wtx)))) {
+		if (!(wtx.IsCoinBase() || wtx.IsCoinStake()) && (nDepth == 0 && !wtx.isAbandoned()) && (IsMine(wtx) || IsFromMe(wtx))){
            mapSorted.insert(std::make_pair(wtx.nOrderPos, &wtx));
        }
    }