diff options
| author | Luke Dashjr <luke-jr+git@utopios.org> | 2012-11-14 21:25:29 +0000 |
|---|---|---|
| committer | Luke Dashjr <luke-jr+git@utopios.org> | 2012-11-14 21:25:29 +0000 |
| commit | d9b50a8cfdfa0b327629dc18076dbd1563dfba3e (patch) | |
| tree | 57ba691f55b45511ff5f4f277175c03796689c4a /src/main.cpp | |
| parent | 220de9aafbdb76fa620531fc5c0b01ffa6616d7b (diff) | |
| parent | 65cee0bbbdea49c08bc84be7824ab004cc19f57e (diff) | |
| download | bitcoin-d9b50a8cfdfa0b327629dc18076dbd1563dfba3e.tar.xz | |
Merge branch '0.4.x' into 0.5.x
Conflicts:
src/bitcoinrpc.cpp
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 7e9bc4efb0..460b5ddf84 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -3096,7 +3096,7 @@ public: CBlock* CreateNewBlock(CReserveKey& reservekey) { - CBlockIndex* pindexPrev = pindexBest; + CBlockIndex* pindexPrev; // Create new block auto_ptr<CBlock> pblock(new CBlock()); @@ -3118,6 +3118,7 @@ CBlock* CreateNewBlock(CReserveKey& reservekey) CRITICAL_BLOCK(cs_main) CRITICAL_BLOCK(cs_mapTransactions) { + pindexPrev = pindexBest; CTxDB txdb("r"); // Priority order to process transactions |