Merge pull request #4697

da2ede2 [Wallet] Improve ReorderTransactions(..) (Cozz Lovan)
2014-09-08 11:05:41 +02:00 · 2014-09-08 11:05:41 +02:00 · 297998808a
parent 1f01b29c6f da2ede2aa6
commit 297998808a
1 changed files with 7 additions and 2 deletions
--- 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;
 }