rottenwheel/monero
1
0
Fork 0
mirror of https://codeberg.org/anoncontributorxmr/monero.git synced 2024-11-29 10:43:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #7108

Browse source 
19f7757 protocol: fix switchting to adding blocks if noone's adding the next span (moneromooo-monero)
This commit is contained in:
luigi1111 2020-12-10 15:48:04 -06:00
commit 316dcaa399
No known key found for this signature in database
GPG key ID: F4ACA0183641E010
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/cryptonote_protocol/cryptonote_protocol_handler.inl
View file

@ -2309,8 +2309,7 @@ skip:
uint64_t start_height; uint64_t start_height;
std::vector<cryptonote::block_complete_entry> blocks; std::vector<cryptonote::block_complete_entry> blocks;
boost::uuids::uuid span_connection_id; boost::uuids::uuid span_connection_id;
bool filled = false; if (m_block_queue.get_next_span(start_height, blocks, span_connection_id, true))
if (m_block_queue.get_next_span(start_height, blocks, span_connection_id, filled) && filled)
{ {
LOG_DEBUG_CC(context, "No other thread is adding blocks, resuming"); LOG_DEBUG_CC(context, "No other thread is adding blocks, resuming");
MLOG_PEER_STATE("will try to add blocks next"); MLOG_PEER_STATE("will try to add blocks next");