diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2020-12-10 15:48:04 -0600 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2020-12-10 15:48:04 -0600 |
| commit | 316dcaa39955eff2a13f1d1869b8c38e46aba42c (patch) | |
| tree | 00a6b05fd7875ca489771725249cd9d03026fc18 | |
| parent | 34267f419e1b4787b4c0b6fed37bdda9f1d66a50 (diff) | |
| parent | 19f77578e0bc63b66db23c0bf5fef66d5403a0b7 (diff) | |
| download | monzero-core-316dcaa39955eff2a13f1d1869b8c38e46aba42c.tar.gz monzero-core-316dcaa39955eff2a13f1d1869b8c38e46aba42c.tar.xz monzero-core-316dcaa39955eff2a13f1d1869b8c38e46aba42c.zip | |
Merge pull request #7108
19f7757 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"); |