diff options
| author | Luke Dashjr <[email protected]> | 2012-11-14 21:26:56 +0000 |
|---|---|---|
| committer | Luke Dashjr <[email protected]> | 2012-11-14 21:26:56 +0000 |
| commit | f1a9aad7893173b0351ad32e684dad6f31598210 (patch) | |
| tree | 21373860cc7f22da72e28d97263813f53e450920 /src/main.cpp | |
| parent | No need for test fixture now that multisig is enabled on main network. (diff) | |
| parent | Merge branch '0.5.x' into 0.6.0.x (diff) | |
| download | discoin-f1a9aad7893173b0351ad32e684dad6f31598210.tar.xz discoin-f1a9aad7893173b0351ad32e684dad6f31598210.zip | |
Merge branch '0.6.0.x' into 0.6.x
Conflicts:
src/init.cpp
src/main.cpp
src/serialize.h
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main.cpp b/src/main.cpp index af78036b0..9f5312a7e 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -3260,7 +3260,7 @@ uint64 nLastBlockSize = 0; CBlock* CreateNewBlock(CReserveKey& reservekey) { - CBlockIndex* pindexPrev = pindexBest; + CBlockIndex* pindexPrev; // Create new block auto_ptr<CBlock> pblock(new CBlock()); @@ -3281,6 +3281,7 @@ CBlock* CreateNewBlock(CReserveKey& reservekey) int64 nFees = 0; { LOCK2(cs_main, mempool.cs); + pindexPrev = pindexBest; CTxDB txdb("r"); // Priority order to process transactions |