Merge pull request #271

c5206e1 Use daemon height if target height = 0 (Jaquee)
pull/2/head
Riccardo Spagni 8 years ago
commit cd550be6ac
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD

@ -192,6 +192,11 @@ quint64 Wallet::daemonBlockChainTargetHeight() const
if (m_daemonBlockChainTargetHeight == 0
|| m_daemonBlockChainTargetHeightTime.elapsed() / 1000 > m_daemonBlockChainTargetHeightTtl) {
m_daemonBlockChainTargetHeight = m_walletImpl->daemonBlockChainTargetHeight();
// Target height is set to 0 if daemon is synced.
// Use current height from daemon when target height < current height
if (m_daemonBlockChainTargetHeight < m_daemonBlockChainHeight){
m_daemonBlockChainTargetHeight = m_daemonBlockChainHeight;
}
m_daemonBlockChainTargetHeightTime.restart();
}