sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-27 04:52:59 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #4697

Browse Source 
da2ede2 [Wallet] Improve ReorderTransactions(..) (Cozz Lovan)
This commit is contained in:
Wladimir J. van der Laan 2014-09-08 11:05:41 +02:00
commit 297998808a
No known key found for this signature in database
GPG Key ID: 74810B012346C9A6
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/walletdb.cpp
View File

@ -281,8 +281,12 @@ CWalletDB::ReorderTransactions(CWallet* pwallet)
nOrderPos = nOrderPosNext++; nOrderPos = nOrderPosNext++;
nOrderPosOffsets.push_back(nOrderPos); nOrderPosOffsets.push_back(nOrderPos);
if (pacentry) if (pwtx)
// Have to write accounting regardless, since we don't keep it in memory {
if (!WriteTx(pwtx->GetHash(), *pwtx))
return DB_LOAD_FAIL;
}
else
if (!WriteAccountingEntry(pacentry->nEntryNo, *pacentry)) if (!WriteAccountingEntry(pacentry->nEntryNo, *pacentry))
return DB_LOAD_FAIL; return DB_LOAD_FAIL;
} }
@ -311,6 +315,7 @@ CWalletDB::ReorderTransactions(CWallet* pwallet)
return DB_LOAD_FAIL; return DB_LOAD_FAIL;
} }
} }
WriteOrderPosNext(nOrderPosNext);
return DB_LOAD_OK; return DB_LOAD_OK;
} }