diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2020-03-04 10:23:56 -0500 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2020-03-04 10:24:05 -0500 |
| commit | 05f5dd96c71e8d989c6f04771a3eab9d41f1ea49 (patch) | |
| tree | 57a9d33b569c77c7ae8481ebf2d76ec42a7dd618 | |
| parent | 58ba7c314d552cea8cb024960a8504577aee586f (diff) | |
| parent | 48fef5ebae58b0730619182007218941bd339768 (diff) | |
| download | bitcoin-05f5dd96c71e8d989c6f04771a3eab9d41f1ea49.tar.xz | |
Merge #18218: [0.19] Further 0.19 backports
48fef5ebae58b0730619182007218941bd339768 gui: Fix race in WalletModel::pollBalanceChanged (Russell Yanofsky)
1964561a3a5eacbb27139e9125859854c0e77437 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 48fef5ebae58b0730619182007218941bd339768.
laanwj:
ACK 48fef5ebae58b0730619182007218941bd339768
luke-jr:
utACK 48fef5ebae58b0730619182007218941bd339768
Tree-SHA512: c7e7ddda9ee7b8015f16d39aab000e0595f85fe073f79abc1a57b3e2adb0dedc4e07e5fd918e1df5e88b7f3fbc39b57ab3382233c4354b9c2196f65fa1fa6c04
| -rw-r--r-- | depends/packages/native_libdmg-hfsplus.mk | 2 | ||||
| -rw-r--r-- | src/qt/walletmodel.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/depends/packages/native_libdmg-hfsplus.mk b/depends/packages/native_libdmg-hfsplus.mk index a4ffb6046c..3a784cccdd 100644 --- a/depends/packages/native_libdmg-hfsplus.mk +++ b/depends/packages/native_libdmg-hfsplus.mk @@ -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 diff --git a/src/qt/walletmodel.cpp b/src/qt/walletmodel.cpp index 05ab805bfd..cb8dd3cc10 100644 --- a/src/qt/walletmodel.cpp +++ b/src/qt/walletmodel.cpp @@ -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) |