From 5260a4aca1e6c11e1dbca9d3390c0dc739e81204 Mon Sep 17 00:00:00 2001 From: MeshCollider Date: Tue, 26 Dec 2017 19:18:39 +1300 Subject: [PATCH] Make .walletlock distinct from .lock --- src/wallet/db.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/wallet/db.cpp b/src/wallet/db.cpp index a647a5b02..e3366e106 100644 --- a/src/wallet/db.cpp +++ b/src/wallet/db.cpp @@ -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) 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; }