diff options
| author | Riccardo Spagni <ric@spagni.net> | 2016-12-14 23:39:23 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2016-12-14 23:39:23 +0200 |
| commit | cd550be6ac5efb4a55a27759ddcb90b0be94f180 (patch) | |
| tree | f62de5c61e2a17b9752ef04ad60538e5ddcfa03e /src | |
| parent | 899b844dd06b8a7789aa0ce1e456fe3d662f1d0f (diff) | |
| parent | c5206e16e321caefddaf61feddddb711af6b0cac (diff) | |
| download | monzero-gui-cd550be6ac5efb4a55a27759ddcb90b0be94f180.tar.gz monzero-gui-cd550be6ac5efb4a55a27759ddcb90b0be94f180.tar.xz monzero-gui-cd550be6ac5efb4a55a27759ddcb90b0be94f180.zip | |
Merge pull request #271
c5206e1 Use daemon height if target height = 0 (Jaquee)
Diffstat (limited to 'src')
| -rw-r--r-- | src/libwalletqt/Wallet.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/libwalletqt/Wallet.cpp b/src/libwalletqt/Wallet.cpp index 5eb9cb46..64c7af2c 100644 --- a/src/libwalletqt/Wallet.cpp +++ b/src/libwalletqt/Wallet.cpp @@ -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(); } |