diff options
| author | Jeff Garzik <jeff@garzik.org> | 2012-05-22 17:45:00 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@redhat.com> | 2012-05-22 17:45:00 -0400 |
| commit | 0134a1c08ce237b41470e62841af193e8a1e9457 (patch) | |
| tree | db38fb1b7343857e7df5c4698e2b9a821be0c36f /src/init.cpp | |
| parent | 5d0f7c4f47e6b9aa382846dd9b4a034e724d461a (diff) | |
| parent | ffe8b77a617efd802a9d4ba7e42b163fbd9a250b (diff) | |
| download | bitcoin-0134a1c08ce237b41470e62841af193e8a1e9457.tar.xz | |
Merge branch 'dbenv' into tmp
Conflicts:
src/db.cpp
Diffstat (limited to 'src/init.cpp')
| -rw-r--r-- | src/init.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/init.cpp b/src/init.cpp index f5eac511aa..c01dc27086 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -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"); |