Skip to content

Commit

Permalink
Merge pull request #6464
Browse files Browse the repository at this point in the history
2d8c49d Clean up tx prioritization when conflict mined (Casey Rodarmor)
  • Loading branch information
laanwj committed Oct 27, 2015
2 parents 38369dd + 2d8c49d commit 8f3b3cd
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions src/txmempool.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -512,6 +512,7 @@ void CTxMemPool::removeConflicts(const CTransaction &tx, std::list<CTransaction>
if (txConflict != tx)
{
remove(txConflict, removed, true);
ClearPrioritisation(txConflict.GetHash());
}
}
}
Expand Down

0 comments on commit 8f3b3cd

Please sign in to comment.