LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity

Merge pull request #2024 from Diapolo/fix_qt_crash

Browse source 
Bitcoin-Qt: fix crash on Windows caused by CDBEnv::EnvShutdown()
This commit is contained in:
Wladimir J. van der Laan 2012-11-22 02:08:42 -08:00
commit b0e228a4b0
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/db.cpp
View file

@ -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 |

1
src/db.h
View file

@ -33,6 +33,7 @@ class CDBEnv
private:
bool fDbEnvInit;
bool fMockDb;
std::string strPath;
void EnvShutdown();