sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-27 04:52:59 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make .walletlock distinct from .lock

Browse Source
This commit is contained in:
MeshCollider 2017-12-26 19:18:39 +13:00
parent 64226de908
commit 5260a4aca1
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/wallet/db.cpp
View File

@ -57,7 +57,7 @@ void CheckUniqueFileid(const CDBEnv& env, const std::string& filename, Db& db)
bool LockEnvDirectory(const fs::path& env_path) bool LockEnvDirectory(const fs::path& env_path)
{ {
// Make sure only a single Bitcoin process is using the wallet directory. // Make sure only a single Bitcoin process is using the wallet directory.
fs::path lock_file_path = env_path / ".lock"; fs::path lock_file_path = env_path / ".walletlock";
FILE* file = fsbridge::fopen(lock_file_path, "a"); // empty lock file; created if it doesn't exist. FILE* file = fsbridge::fopen(lock_file_path, "a"); // empty lock file; created if it doesn't exist.
if (file) fclose(file); if (file) fclose(file);
@ -123,7 +123,7 @@ bool CDBEnv::Open(const fs::path& pathIn, bool retry)
strPath = pathIn.string(); strPath = pathIn.string();
if (!LockEnvDirectory(pathIn)) { if (!LockEnvDirectory(pathIn)) {
LogPrintf("Cannot obtain a lock on wallet directory %s. Another instance of bitcoin may be using it.", strPath); LogPrintf("Cannot obtain a lock on wallet directory %s. Another instance of bitcoin may be using it.\n", strPath);
return false; return false;
} }