diff options
| author | Riccardo Spagni <ric@spagni.net> | 2017-02-27 22:25:09 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2017-02-27 22:25:09 +0200 |
| commit | f738b6ac67809306393806c07c0dc5582c956919 (patch) | |
| tree | d28ea0769f0d250237515727dc6c21be21bd7984 /src | |
| parent | fc6a214197bc71ac63c1bd5e2031508bb181b0b6 (diff) | |
| parent | 3adeab87ed15b02b9818f7dcd626a627dd6ab08b (diff) | |
| download | monzero-gui-f738b6ac67809306393806c07c0dc5582c956919.tar.gz monzero-gui-f738b6ac67809306393806c07c0dc5582c956919.tar.xz monzero-gui-f738b6ac67809306393806c07c0dc5582c956919.zip | |
Merge pull request #489
3adeab8 wallet sync: progressbar ui improvements (Jaquee)
2d6ddf0 Improved blockchain sync status ui (Jaquee)
465f6bf fix daemon startup with --check-updates disabled (Jaquee)
Diffstat (limited to 'src')
| -rw-r--r-- | src/daemon/DaemonManager.cpp | 2 | ||||
| -rw-r--r-- | src/libwalletqt/Wallet.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/daemon/DaemonManager.cpp b/src/daemon/DaemonManager.cpp index e1e89f61..0820b462 100644 --- a/src/daemon/DaemonManager.cpp +++ b/src/daemon/DaemonManager.cpp @@ -44,7 +44,7 @@ bool DaemonManager::start(const QString &flags, bool testnet) arguments << str; } - arguments << "--updates" << "disabled"; + arguments << "--check-updates" << "disabled"; qDebug() << "starting monerod " + m_monerod; qDebug() << "With command line arguments " << arguments; diff --git a/src/libwalletqt/Wallet.cpp b/src/libwalletqt/Wallet.cpp index 8913d4c3..77b35d06 100644 --- a/src/libwalletqt/Wallet.cpp +++ b/src/libwalletqt/Wallet.cpp @@ -21,7 +21,7 @@ namespace { static const int DAEMON_BLOCKCHAIN_HEIGHT_CACHE_TTL_SECONDS = 5; - static const int DAEMON_BLOCKCHAIN_TARGET_HEIGHT_CACHE_TTL_SECONDS = 60; + static const int DAEMON_BLOCKCHAIN_TARGET_HEIGHT_CACHE_TTL_SECONDS = 30; static const int WALLET_CONNECTION_STATUS_CACHE_TTL_SECONDS = 5; } @@ -262,7 +262,7 @@ quint64 Wallet::daemonBlockChainHeight() const quint64 Wallet::daemonBlockChainTargetHeight() const { - if (m_daemonBlockChainTargetHeight == 0 + if (m_daemonBlockChainTargetHeight <= 1 || m_daemonBlockChainTargetHeightTime.elapsed() / 1000 > m_daemonBlockChainTargetHeightTtl) { m_daemonBlockChainTargetHeight = m_walletImpl->daemonBlockChainTargetHeight(); |