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

Merge branch 'dbenv' into tmp

Browse source 
Conflicts:
	src/db.cpp
This commit is contained in:
Jeff Garzik 2012-05-22 17:45:00 -04:00 • committed by Jeff Garzik
commit 0134a1c08c
5 changed files with 165 additions and 138 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/init.cpp
View file

@ -56,9 +56,9 @@ void Shutdown(void* parg)
{
fShutdown = true;
nTransactionsUpdated++;
DBFlush(false);
bitdb.Flush(false);
StopNode();
DBFlush(true);
bitdb.Flush(true);
boost::filesystem::remove(GetPidFile());
UnregisterWallet(pwalletMain);
delete pwalletMain;
@ -335,7 +335,7 @@ bool AppInit2()
// ********************************************************* Step 3: parameter-to-internal-flags
fDebug = GetBoolArg("-debug");
fDetachDB = GetBoolArg("-detachdb", false);
bitdb.SetDetach(GetBoolArg("-detachdb", false));
#if !defined(WIN32) && !defined(QT_GUI)
fDaemon = GetBoolArg("-daemon");