diff options
| author | Riccardo Spagni <ric@spagni.net> | 2016-10-04 12:08:33 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2016-10-04 12:08:33 +0200 |
| commit | d60826c0b98300205a2f34116b561805c6f8b8cd (patch) | |
| tree | 12a07c10ef5b94bde3535a552eadc23036d6b555 | |
| parent | Merge pull request #1125 (diff) | |
| parent | Revert "Fix fake 'network synchronized, begin using' messages" (diff) | |
| download | monero-d60826c0b98300205a2f34116b561805c6f8b8cd.tar.xz | |
Merge pull request #1133
cec090f Revert "Fix fake 'network synchronized, begin using' messages" (moneromooo-monero)
| -rw-r--r-- | src/cryptonote_core/cryptonote_core.cpp | 5 | ||||
| -rw-r--r-- | src/cryptonote_protocol/cryptonote_protocol_handler.inl | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/src/cryptonote_core/cryptonote_core.cpp b/src/cryptonote_core/cryptonote_core.cpp index bd8a6a493..149fb09df 100644 --- a/src/cryptonote_core/cryptonote_core.cpp +++ b/src/cryptonote_core/cryptonote_core.cpp @@ -958,10 +958,7 @@ namespace cryptonote //----------------------------------------------------------------------------------------------- void core::set_target_blockchain_height(uint64_t target_blockchain_height) { - if (target_blockchain_height > m_target_blockchain_height) - { - m_target_blockchain_height = target_blockchain_height; - } + m_target_blockchain_height = target_blockchain_height; } //----------------------------------------------------------------------------------------------- uint64_t core::get_target_blockchain_height() const diff --git a/src/cryptonote_protocol/cryptonote_protocol_handler.inl b/src/cryptonote_protocol/cryptonote_protocol_handler.inl index 1f7047bed..1d1cd3631 100644 --- a/src/cryptonote_protocol/cryptonote_protocol_handler.inl +++ b/src/cryptonote_protocol/cryptonote_protocol_handler.inl @@ -261,7 +261,7 @@ namespace cryptonote if(context.m_state == cryptonote_connection_context::state_synchronizing) return true; - if(m_core.have_block(hshd.top_id) && !(hshd.current_height < m_core.get_target_blockchain_height())) + if(m_core.have_block(hshd.top_id)) { context.m_state = cryptonote_connection_context::state_normal; if(is_inital) |