From ba9738cab6d783666edbabdd3561ca7e138da1bf Mon Sep 17 00:00:00 2001
From: woodser <woodser@protonmail.com>
Date: Mon, 11 Jan 2021 10:27:04 -0500
Subject: [PATCH] bug fix in new block merge

---
 src/daemon/monero_daemon_model.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/daemon/monero_daemon_model.cpp b/src/daemon/monero_daemon_model.cpp
index 987fc41..3a92539 100644
--- a/src/daemon/monero_daemon_model.cpp
+++ b/src/daemon/monero_daemon_model.cpp
@@ -409,7 +409,7 @@ namespace monero {
       if (m_block == boost::none) {
         m_block = other->m_block;
         std::replace(m_block.get()->m_txs.begin(), m_block.get()->m_txs.end(), other, self); // update block to point to this tx
-      } else if (other->m_block == boost::none) {
+      } else if (other->m_block != boost::none) {
         m_block.get()->merge(m_block.get(), other->m_block.get()); // comes back to merging txs
         return;
       }