highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-11-12 23:18:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

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
parent 5d0f7c4f47 ffe8b77a61
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");