diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-06-24 16:48:48 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-06-24 17:04:52 +0200 |
| commit | d4392c898917bb83719d96712b20854831ed030f (patch) | |
| tree | 07bded85f39e1a24d70652a5bb984373fa541a7c /src/wallet.cpp | |
| parent | 36db6633c314b0f41aeee856f74a8d5d59334dbb (diff) | |
| parent | 77cbd4623e171ee9c48ada8a421295ed2c8e6c7c (diff) | |
| download | bitcoin-d4392c898917bb83719d96712b20854831ed030f.tar.xz | |
Merge pull request #3674
77cbd46 Let -zapwallettxes recover transaction meta data (Cozz Lovan)
Diffstat (limited to 'src/wallet.cpp')
| -rw-r--r-- | src/wallet.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/wallet.cpp b/src/wallet.cpp index 7664d6c25c..e74980e9e7 100644 --- a/src/wallet.cpp +++ b/src/wallet.cpp @@ -1514,11 +1514,11 @@ DBErrors CWallet::LoadWallet(bool& fFirstRunRet) } -DBErrors CWallet::ZapWalletTx() +DBErrors CWallet::ZapWalletTx(std::vector<CWalletTx>& vWtx) { if (!fFileBacked) return DB_LOAD_OK; - DBErrors nZapWalletTxRet = CWalletDB(strWalletFile,"cr+").ZapWalletTx(this); + DBErrors nZapWalletTxRet = CWalletDB(strWalletFile,"cr+").ZapWalletTx(this, vWtx); if (nZapWalletTxRet == DB_NEED_REWRITE) { if (CDB::Rewrite(strWalletFile, "\x04pool")) |