aboutsummaryrefslogtreecommitdiff
path: root/src/wallet
diff options
context:
space:
mode:
authorMeshCollider <dobsonsa68@gmail.com>2017-12-26 19:18:39 +1300
committerMeshCollider <dobsonsa68@gmail.com>2018-01-16 19:05:46 +1300
commit5260a4aca1e6c11e1dbca9d3390c0dc739e81204 (patch)
tree8a49f7e4369a6cb5ea299b905f990944aae2a93e /src/wallet
parent64226de908c76997fadf147342c494ad0662fa43 (diff)
Make .walletlock distinct from .lock
Diffstat (limited to 'src/wallet')
-rw-r--r--src/wallet/db.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/wallet/db.cpp b/src/wallet/db.cpp
index a647a5b025..e3366e1060 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;
}