GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-15 12:51:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #4805

Browse source 
44bc988 [Wallet] Do not flush the wallet in AddToWalletIfInvolvingMe(..) (Cozz Lovan)
This commit is contained in:
Wladimir J. van der Laan 2015-01-26 12:18:42 +01:00
commit 8204e19abe
No known key found for this signature in database
GPG key ID: 74810B012346C9A6
8 changed files with 30 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/db.cpp
View file

@ -217,10 +217,11 @@ void CDBEnv::CheckpointLSN(const std::string& strFile)
}
CDB::CDB(const std::string& strFilename, const char* pszMode) : pdb(NULL), activeTxn(NULL)
CDB::CDB(const std::string& strFilename, const char* pszMode, bool fFlushOnCloseIn) : pdb(NULL), activeTxn(NULL)
{
int ret;
fReadOnly = (!strchr(pszMode, '+') && !strchr(pszMode, 'w'));
fFlushOnClose = fFlushOnCloseIn;
if (strFilename.empty())
return;
@ -297,7 +298,8 @@ void CDB::Close()
activeTxn = NULL;
pdb = NULL;
Flush();
if (fFlushOnClose)
Flush();
{
LOCK(bitdb.cs_db);