Merge pull request #5477

97e1c927 wallet: fix key image computation signaling to the device (Dusan Klinec)
This commit is contained in:
Riccardo Spagni 2019-04-24 22:38:36 +02:00
commit edcb0cfff2
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD

View File

@ -3129,6 +3129,7 @@ void wallet2::refresh(bool trusted_daemon, uint64_t start_height, uint64_t & blo
} }
}); });
auto scope_exit_handler_hwdev = epee::misc_utils::create_scope_leave_handler([&](){hwdev.computing_key_images(false);});
bool first = true; bool first = true;
while(m_run.load(std::memory_order_relaxed)) while(m_run.load(std::memory_order_relaxed))
{ {
@ -3254,7 +3255,6 @@ void wallet2::refresh(bool trusted_daemon, uint64_t start_height, uint64_t & blo
LOG_PRINT_L1("Failed to check pending transactions"); LOG_PRINT_L1("Failed to check pending transactions");
} }
hwdev.computing_key_images(false);
m_first_refresh_done = true; m_first_refresh_done = true;
LOG_PRINT_L1("Refresh done, blocks received: " << blocks_fetched << ", balance (all accounts): " << print_money(balance_all()) << ", unlocked: " << print_money(unlocked_balance_all())); LOG_PRINT_L1("Refresh done, blocks received: " << blocks_fetched << ", balance (all accounts): " << print_money(balance_all()) << ", unlocked: " << print_money(unlocked_balance_all()));