github-jwinterm/myriadcoin
1
0
Fork 0
mirror of https://github.com/jwinterm/myriadcoin.git synced 2026-10-21 06:18:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '0.5.x' into 0.6.0.x

Browse Source
This commit is contained in:
Luke Dashjr
2012-11-14 21:25:35 +00:00
parent ff31f1fa10 d9b50a8cfd
commit 8045273a01
12 changed files with 21 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main.cpp
+2 -1
View File
@@ -3234,7 +3234,7 @@ uint64 nLastBlockSize = 0;
CBlock* CreateNewBlock(CReserveKey& reservekey)
{
CBlockIndex* pindexPrev = pindexBest;
CBlockIndex* pindexPrev;
// Create new block
auto_ptr<CBlock> pblock(new CBlock());
@@ -3256,6 +3256,7 @@ CBlock* CreateNewBlock(CReserveKey& reservekey)
CRITICAL_BLOCK(cs_main)
CRITICAL_BLOCK(cs_mapTransactions)
{
pindexPrev = pindexBest;
CTxDB txdb("r");
// Priority order to process transactions