Merge 501203a into merged_master (Bitcoin PR bitcoin-core/gui#17)

src/qt/transactiontablemodel.cpp

@@ -181,17 +181,12 @@ class TransactionTablePriv
 
  TransactionRecord* index(interfaces::Wallet& wallet, const uint256& cur_block_hash, const int idx)
  {
- if(idx >= 0 && idx < cachedWallet.size())
- {
+ if (idx >= 0 && idx < cachedWallet.size()) {
  TransactionRecord *rec = &cachedWallet[idx];
 
- // Get required locks upfront. This avoids the GUI from getting
- // stuck if the core is holding the locks for a longer time - for
- // example, during a wallet rescan.
- //
  // If a status update is needed (blocks came in since last check),
- //  update the status of this transaction from the wallet. Otherwise,
- // simply re-use the cached status.
+ // try to update the status of this transaction from the wallet.
+ // Otherwise, simply re-use the cached status.
  interfaces::WalletTxStatus wtx;
  int numBlocks;
  int64_t block_time;