GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-17 13:07:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 5bbbc0d0ee into merged_master (Bitcoin PR bitcoin/bitcoin#31325)

Browse source
This commit is contained in:
ivanlele 2026-04-09 10:52:28 +00:00
commit 5ddaed6129
No known key found for this signature in database
5 changed files with 17 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/node/interfaces.cpp
View file

@ -989,7 +989,9 @@ public:
{
WAIT_LOCK(notifications().m_tip_block_mutex, lock);
notifications().m_tip_block_cv.wait_for(lock, timeout, [&]() EXCLUSIVE_LOCKS_REQUIRED(notifications().m_tip_block_mutex) {
return (notifications().m_tip_block != current_tip && notifications().m_tip_block != uint256::ZERO) || chainman().m_interrupt;
// We need to wait for m_tip_block to be set AND for the value
// to differ from the current_tip value.
return (notifications().TipBlock() && notifications().TipBlock() != current_tip) || chainman().m_interrupt;
});
}
// Must release m_tip_block_mutex before locking cs_main, to avoid deadlocks.