diff options
| author | Wladimir J. van der Laan <[email protected]> | 2014-09-08 11:05:41 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2014-09-08 11:07:00 +0200 |
| commit | 297998808a606936f45b371a978e3c2039b37cf6 (patch) | |
| tree | 602721c9430fccda61880e3909aeb81e4102489f /src/walletdb.cpp | |
| parent | Merge pull request #4862 (diff) | |
| parent | [Wallet] Improve ReorderTransactions(..) (diff) | |
| download | discoin-297998808a606936f45b371a978e3c2039b37cf6.tar.xz discoin-297998808a606936f45b371a978e3c2039b37cf6.zip | |
Merge pull request #4697
da2ede2 [Wallet] Improve ReorderTransactions(..) (Cozz Lovan)
Diffstat (limited to 'src/walletdb.cpp')
| -rw-r--r-- | src/walletdb.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/walletdb.cpp b/src/walletdb.cpp index 2fa607165..48045b98c 100644 --- a/src/walletdb.cpp +++ b/src/walletdb.cpp @@ -281,8 +281,12 @@ CWalletDB::ReorderTransactions(CWallet* pwallet) nOrderPos = nOrderPosNext++; nOrderPosOffsets.push_back(nOrderPos); - if (pacentry) - // Have to write accounting regardless, since we don't keep it in memory + if (pwtx) + { + if (!WriteTx(pwtx->GetHash(), *pwtx)) + return DB_LOAD_FAIL; + } + else if (!WriteAccountingEntry(pacentry->nEntryNo, *pacentry)) return DB_LOAD_FAIL; } @@ -311,6 +315,7 @@ CWalletDB::ReorderTransactions(CWallet* pwallet) return DB_LOAD_FAIL; } } + WriteOrderPosNext(nOrderPosNext); return DB_LOAD_OK; } |