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

Merge 8f3ab9a1b1 into merged_master (Bitcoin PR bitcoin/bitcoin#24931)

Browse source
This commit is contained in:
James Dorfman 2024-09-09 21:13:17 +00:00
commit c472e94b84
17 changed files with 78 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/net_processing.cpp
View file

@ -292,7 +292,7 @@ struct Peer {
return m_tx_relay.get();
};
TxRelay* GetTxRelay()
TxRelay* GetTxRelay() EXCLUSIVE_LOCKS_REQUIRED(!m_tx_relay_mutex)
{
return WITH_LOCK(m_tx_relay_mutex, return m_tx_relay.get());
};