monero-project/monero
monero-project/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-12-25 04:59:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1509

Browse source 
29333c41 wallet api: prevent setting refresh height too high (Jaquee)
This commit is contained in:
Riccardo Spagni 2017-01-08 16:39:23 -08:00
commit da05900524
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/wallet/api/wallet.cpp
View file

@ -1010,9 +1010,6 @@ void WalletImpl::doRefresh()
// Syncing daemon and refreshing wallet simultaneously is very resource intensive. // Syncing daemon and refreshing wallet simultaneously is very resource intensive.
// Disable refresh if wallet is disconnected or daemon isn't synced. // Disable refresh if wallet is disconnected or daemon isn't synced.
if (daemonSynced()) { if (daemonSynced()) {
// Use fast refresh for new wallets
if (isNewWallet())
m_wallet->set_refresh_from_block_height(daemonBlockChainHeight());
m_wallet->refresh(); m_wallet->refresh();
if (!m_synchronized) { if (!m_synchronized) {
m_synchronized = true; m_synchronized = true;
@ -1079,7 +1076,8 @@ void WalletImpl::doInit(const string &daemon_address, uint64_t upper_transaction
m_wallet->init(daemon_address, upper_transaction_size_limit); m_wallet->init(daemon_address, upper_transaction_size_limit);
// in case new wallet, this will force fast-refresh (pulling hashes instead of blocks) // in case new wallet, this will force fast-refresh (pulling hashes instead of blocks)
if (isNewWallet()) { // If daemon isn't synced a calculated block height will be used instead
if (isNewWallet() && daemonSynced()) {
m_wallet->set_refresh_from_block_height(daemonBlockChainHeight()); m_wallet->set_refresh_from_block_height(daemonBlockChainHeight());
} }