Bitcoin-Qt: emit numBlocksChanged for changed reindex or importing state #2469

pull Diapolo wants to merge 1 commits into bitcoin:master from Diapolo:clientmodel-progress changing 2 files +10 −2

Diapolo commented at 10:17 AM on April 6, 2013: none
- this allows our progressbarlabel to correctly update, when we finish a reindex or import, but do not get new blocks from other sources
Fixes orphan label messages for me, which I find rather ugly ;).

Bitcoin-Qt: emit numBlocksChanged for changed reindex or importing state

- this allows our progressbarlabel to correctly update, when we
  finish a reindex or import, but do not get new blocks from other sources

87dd6035e5

in src/qt/clientmodel.h:None in f5c4b7c90e outdated
```
  14 | @@ -15,9 +15,9 @@
  15 |  
  16 |  enum BlockSource {
  17 |      BLOCK_SOURCE_NONE,
  18 | -    BLOCK_SOURCE_NETWORK,
  19 | +    BLOCK_SOURCE_REINDEX,
  20 |      BLOCK_SOURCE_DISK,
  21 | -    BLOCK_SOURCE_REINDEX
  22 | +    BLOCK_SOURCE_NETWORK
```
sipa commented at 4:23 PM on April 6, 2013:

Any reason for swapping these?

Diapolo commented at 4:49 PM on April 6, 2013:

Another pull I have in the pipe has small updates for ClientModel::getBlockSource() and it's usage. I intended to refelect the used order in that function here in the enum. But you are right it does not belong into this pull ;).

Edit: Removed from that pull!
BitcoinPullTester commented at 7:55 PM on April 6, 2013: none

Automatic sanity-testing: PASSED, see http://jenkins.bluematt.me/pull-tester/87dd6035e583d45d6c2e464867425ee1a9cad8e9 for binaries and test log. This test script verifies pulls every time they are updated. It, however, dies sometimes and fails to test properly. If you are waiting on a test, please check timestamps to verify that the test.log is moving at http://jenkins.bluematt.me/pull-tester/current/ Contact BlueMatt on freenode if something looks broken.
Diapolo commented at 7:06 AM on April 9, 2013: none

@laanwj Can this also make it into 0.8.2?
laanwj commented at 7:49 AM on April 9, 2013: member

ACK
gavinandresen referenced this in commit c553fe8d43 on Apr 9, 2013
gavinandresen merged this on Apr 9, 2013
gavinandresen closed this on Apr 9, 2013
laudney referenced this in commit ffc2f178f2 on Mar 19, 2014
DrahtBot locked this on Sep 8, 2021

Contributors