diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-01-26 12:18:42 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-01-26 12:19:12 +0100 |
| commit | 8204e19abed6c6ee8dca4a00943abfc52ea68fab (patch) | |
| tree | 630099e9f695ed98b34cc0f4be992bb581c98a19 /src/wallet.h | |
| parent | b01a435c34f0669affece2b3d90f92c347588d69 (diff) | |
| parent | 44bc988e7becb492a78ed92ea1052f4789012534 (diff) | |
| download | bitcoin-8204e19abed6c6ee8dca4a00943abfc52ea68fab.tar.xz | |
Merge pull request #4805
44bc988 [Wallet] Do not flush the wallet in AddToWalletIfInvolvingMe(..) (Cozz Lovan)
Diffstat (limited to 'src/wallet.h')
| -rw-r--r-- | src/wallet.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/wallet.h b/src/wallet.h index 1d0dc97c6c..f9cbd3a849 100644 --- a/src/wallet.h +++ b/src/wallet.h @@ -275,7 +275,7 @@ public: TxItems OrderedTxItems(std::list<CAccountingEntry>& acentries, std::string strAccount = ""); void MarkDirty(); - bool AddToWallet(const CWalletTx& wtxIn, bool fFromLoadWallet=false); + bool AddToWallet(const CWalletTx& wtxIn, bool fFromLoadWallet, CWalletDB* pwalletdb); void SyncTransaction(const CTransaction& tx, const CBlock* pblock); bool AddToWalletIfInvolvingMe(const CTransaction& tx, const CBlock* pblock, bool fUpdate); void EraseFromWallet(const uint256 &hash); @@ -903,7 +903,7 @@ public: return true; } - bool WriteToDisk(); + bool WriteToDisk(CWalletDB *pwalletdb); int64_t GetTxTime() const; int GetRequestCount() const; |