diff options
| author | Wladimir J. van der Laan <[email protected]> | 2012-11-22 02:08:42 -0800 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2012-11-22 02:08:42 -0800 |
| commit | b0e228a4b03dbf4b5ab3b21b8712e8bf8706e4d8 (patch) | |
| tree | a1f81da78975554cbe4a73e7754f88028410e391 /src/db.cpp | |
| parent | Merge pull request #2031 from gavinandresen/scriptcomment (diff) | |
| parent | Bitcoin-Qt: fix crash on Windows caused by CDBEnv::EnvShutdown() (diff) | |
| download | discoin-b0e228a4b03dbf4b5ab3b21b8712e8bf8706e4d8.tar.xz discoin-b0e228a4b03dbf4b5ab3b21b8712e8bf8706e4d8.zip | |
Merge pull request #2024 from Diapolo/fix_qt_crash
Bitcoin-Qt: fix crash on Windows caused by CDBEnv::EnvShutdown()
Diffstat (limited to 'src/db.cpp')
| -rw-r--r-- | src/db.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/db.cpp b/src/db.cpp index 60e1f6f28..94629f3ca 100644 --- a/src/db.cpp +++ b/src/db.cpp @@ -38,11 +38,13 @@ void CDBEnv::EnvShutdown() if (ret != 0) printf("EnvShutdown exception: %s (%d)\n", DbEnv::strerror(ret), ret); if (!fMockDb) - DbEnv(0).remove(GetDataDir().string().c_str(), 0); + DbEnv(0).remove(strPath.c_str(), 0); } CDBEnv::CDBEnv() : dbenv(DB_CXX_NO_EXCEPTIONS) { + fDbEnvInit = false; + fMockDb = false; } CDBEnv::~CDBEnv() @@ -63,6 +65,7 @@ bool CDBEnv::Open(const boost::filesystem::path& path) if (fShutdown) return false; + strPath = path.string(); filesystem::path pathLogDir = path / "database"; filesystem::create_directory(pathLogDir); filesystem::path pathErrorFile = path / "db.log"; @@ -83,7 +86,7 @@ bool CDBEnv::Open(const boost::filesystem::path& path) dbenv.set_flags(DB_AUTO_COMMIT, 1); dbenv.set_flags(DB_TXN_WRITE_NOSYNC, 1); dbenv.log_set_config(DB_LOG_AUTO_REMOVE, 1); - int ret = dbenv.open(path.string().c_str(), + int ret = dbenv.open(strPath.c_str(), DB_CREATE | DB_INIT_LOCK | DB_INIT_LOG | |