diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2020-12-10 15:49:20 -0600 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2020-12-10 15:49:20 -0600 |
| commit | f570ce13499eaf1a4f0c5eb87390610816d1d6d9 (patch) | |
| tree | 841aedf56dd8f992077f2141a2018afa2d1b1c8e | |
| parent | Merge pull request #7076 (diff) | |
| parent | protocol: fix switchting to adding blocks if noone's adding the next span (diff) | |
| download | monero-f570ce13499eaf1a4f0c5eb87390610816d1d6d9.tar.xz | |
Merge pull request #7109
e83a220 protocol: fix switchting to adding blocks if noone's adding the next span (moneromooo-monero)
| -rw-r--r-- | src/cryptonote_protocol/cryptonote_protocol_handler.inl | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/cryptonote_protocol/cryptonote_protocol_handler.inl b/src/cryptonote_protocol/cryptonote_protocol_handler.inl index 25b14d903..c62a0cd31 100644 --- a/src/cryptonote_protocol/cryptonote_protocol_handler.inl +++ b/src/cryptonote_protocol/cryptonote_protocol_handler.inl @@ -2309,8 +2309,7 @@ skip: uint64_t start_height; std::vector<cryptonote::block_complete_entry> blocks; boost::uuids::uuid span_connection_id; - bool filled = false; - if (m_block_queue.get_next_span(start_height, blocks, span_connection_id, filled) && filled) + if (m_block_queue.get_next_span(start_height, blocks, span_connection_id, true)) { LOG_DEBUG_CC(context, "No other thread is adding blocks, resuming"); MLOG_PEER_STATE("will try to add blocks next"); |