Merge pull request #1786

4d05955d protocol: fix "sync done" message not appearing (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2017-02-24 12:01:36 +02:00
commit 954cc459d2
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD

View File

@ -266,6 +266,9 @@ namespace cryptonote
return true; return true;
uint64_t target = m_core.get_target_blockchain_height(); uint64_t target = m_core.get_target_blockchain_height();
if (target == 0)
target = m_core.get_current_blockchain_height();
if(m_core.have_block(hshd.top_id)) if(m_core.have_block(hshd.top_id))
{ {
context.m_state = cryptonote_connection_context::state_normal; context.m_state = cryptonote_connection_context::state_normal;
@ -280,7 +283,6 @@ namespace cryptonote
I prefer pushing target height to the core at the same time it is pushed to the user. I prefer pushing target height to the core at the same time it is pushed to the user.
Nz. */ Nz. */
m_core.set_target_blockchain_height(static_cast<int64_t>(hshd.current_height)); m_core.set_target_blockchain_height(static_cast<int64_t>(hshd.current_height));
int64_t diff = static_cast<int64_t>(hshd.current_height) - static_cast<int64_t>(m_core.get_current_blockchain_height()); int64_t diff = static_cast<int64_t>(hshd.current_height) - static_cast<int64_t>(m_core.get_current_blockchain_height());
int64_t max_block_height = max(static_cast<int64_t>(hshd.current_height),static_cast<int64_t>(m_core.get_current_blockchain_height())); int64_t max_block_height = max(static_cast<int64_t>(hshd.current_height),static_cast<int64_t>(m_core.get_current_blockchain_height()));
int64_t last_block_v1 = 1009826; int64_t last_block_v1 = 1009826;