Browse Source

Make .walletlock distinct from .lock

0.16
MeshCollider 7 years ago
parent
commit
5260a4aca1
  1. 4
      src/wallet/db.cpp

4
src/wallet/db.cpp

@ -57,7 +57,7 @@ void CheckUniqueFileid(const CDBEnv& env, const std::string& filename, Db& db) @@ -57,7 +57,7 @@ void CheckUniqueFileid(const CDBEnv& env, const std::string& filename, Db& db)
bool LockEnvDirectory(const fs::path& env_path)
{
// 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.
if (file) fclose(file);
@ -123,7 +123,7 @@ bool CDBEnv::Open(const fs::path& pathIn, bool retry) @@ -123,7 +123,7 @@ bool CDBEnv::Open(const fs::path& pathIn, bool retry)
strPath = pathIn.string();
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;
}

Loading…
Cancel
Save