aboutsummaryrefslogtreecommitdiff
path: root/src/cryptonote_core
diff options
context:
space:
mode:
authorluigi1111 <luigi1111w@gmail.com>2020-02-04 14:38:35 -0500
committerluigi1111 <luigi1111w@gmail.com>2020-02-04 14:38:35 -0500
commitd7aeb5a9f86442b5ac4464896cc7d8eb2740dadb (patch)
tree2ba8b655c50671c13c04f8dba85238e0b0d8bb50 /src/cryptonote_core
parentMerge pull request #6140 (diff)
parentblockchain: fix flushing txes from the txpool (diff)
downloadmonero-d7aeb5a9f86442b5ac4464896cc7d8eb2740dadb.tar.xz
Merge pull request #6233
8a27645 blockchain: fix flushing txes from the txpool (moneromooo-monero)
Diffstat (limited to 'src/cryptonote_core')
-rw-r--r--src/cryptonote_core/blockchain.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/cryptonote_core/blockchain.cpp b/src/cryptonote_core/blockchain.cpp
index f99073719..78893fdf2 100644
--- a/src/cryptonote_core/blockchain.cpp
+++ b/src/cryptonote_core/blockchain.cpp
@@ -3668,7 +3668,7 @@ bool Blockchain::flush_txes_from_pool(const std::vector<crypto::hash> &txids)
uint64_t fee;
bool relayed, do_not_relay, double_spend_seen, pruned;
MINFO("Removing txid " << txid << " from the pool");
- if(!m_tx_pool.have_tx(txid, relay_category::all) && !m_tx_pool.take_tx(txid, tx, txblob, tx_weight, fee, relayed, do_not_relay, double_spend_seen, pruned))
+ if(m_tx_pool.have_tx(txid, relay_category::all) && !m_tx_pool.take_tx(txid, tx, txblob, tx_weight, fee, relayed, do_not_relay, double_spend_seen, pruned))
{
MERROR("Failed to remove txid " << txid << " from the pool");
res = false;