From e2edf95cd3f43331843676e49a82830128a95050 Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Tue, 31 Mar 2015 20:35:04 -0700
Subject: Bugfix: make CreateNewBlock return pindexPrev

---
 src/rpcmining.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/rpcmining.cpp')

diff --git a/src/rpcmining.cpp b/src/rpcmining.cpp
index 49c5c3ca5..6f165028d 100644
--- a/src/rpcmining.cpp
+++ b/src/rpcmining.cpp
@@ -475,7 +475,7 @@ Value getblocktemplate(const Array& params, bool fHelp)
 
         // Store the pindexBest used before CreateNewBlock, to avoid races
         nTransactionsUpdatedLast = mempool.GetTransactionsUpdated();
-        CBlockIndex* pindexPrevNew = chainActive.Tip();
+        CBlockIndex* pindexPrevNew;
         nStart = GetTime();
 
         // Create new block
@@ -485,7 +485,7 @@ Value getblocktemplate(const Array& params, bool fHelp)
             pblocktemplate = NULL;
         }
         CScript scriptDummy = CScript() << OP_TRUE;
-        pblocktemplate = CreateNewBlock(scriptDummy);
+        pblocktemplate = CreateNewBlock(scriptDummy, pindexPrevNew);
         if (!pblocktemplate)
             throw JSONRPCError(RPC_OUT_OF_MEMORY, "Out of memory");
 
-- 
cgit v1.2.3