LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity

Merge #18218: [0.19] Further 0.19 backports

Browse source 
48fef5ebae gui: Fix race in WalletModel::pollBalanceChanged (Russell Yanofsky)
1964561a3a build: don't embed a build-id when building libdmg-hfsplus (fanquake)

Pull request description:

  These are not blockers for the 0.19.1 release, as per [IRC discussion this morning](http://www.erisian.com.au/bitcoin-core-dev/log-2020-02-27.html#l-331), doesn't look like there will be an rc3. This PR can collect further backports for the 0.19 branch.

  Currently backports:
  * https://github.com/bitcoin/bitcoin/pull/18004 - build: don't embed a build-id when building libdmg-hfsplus
  * https://github.com/bitcoin/bitcoin/pull/18123 - gui: Fix race in WalletModel::pollBalanceChanged

ACKs for top commit:
  promag:
    ACK 48fef5ebae.
  laanwj:
    ACK 48fef5ebae
  luke-jr:
    utACK 48fef5ebae

Tree-SHA512: c7e7ddda9ee7b8015f16d39aab000e0595f85fe073f79abc1a57b3e2adb0dedc4e07e5fd918e1df5e88b7f3fbc39b57ab3382233c4354b9c2196f65fa1fa6c04
This commit is contained in:
MarcoFalke 2020-03-04 10:23:56 -05:00
commit 05f5dd96c7
No known key found for this signature in database
GPG key ID: CE2B75697E69A548
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
depends/packages/native_libdmg-hfsplus.mk
View file

@ -10,7 +10,7 @@ define $(package)_preprocess_cmds
endef
define $(package)_config_cmds
cmake -DCMAKE_INSTALL_PREFIX:PATH=$(build_prefix)/bin ..
cmake -DCMAKE_INSTALL_PREFIX:PATH=$(build_prefix)/bin -DCMAKE_C_FLAGS="-Wl,--build-id=none" ..
endef
define $(package)_build_cmds

4
src/qt/walletmodel.cpp
View file

@ -81,12 +81,12 @@ void WalletModel::pollBalanceChanged()
return;
}
if(fForceCheckBalanceChanged || m_node.getNumBlocks() != cachedNumBlocks)
if(fForceCheckBalanceChanged || numBlocks != cachedNumBlocks)
{
fForceCheckBalanceChanged = false;
// Balance and number of transactions might have changed
cachedNumBlocks = m_node.getNumBlocks();
cachedNumBlocks = numBlocks;
checkBalanceChanged(new_balances);
if(transactionTableModel)