Merge branch '0.4.x' into 0.5.x

Conflicts: src/bitcoinrpc.cpp
2026-10-20 06:08:43 +02:00 · 2012-11-14 21:25:29 +00:00
parent 220de9aafb 65cee0bbbd
commit d9b50a8cfd
6 changed files with 15 additions and 10 deletions
@@ -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