Generalise walletdir lock error message for correctness

1 files changed, 3 insertions, 2 deletions

diff --git a/src/wallet/db.cpp b/src/wallet/db.cpp
index c0c24ae98b..a647a5b025 100644
--- a/src/wallet/db.cpp
+++ b/src/wallet/db.cpp
@@ -121,11 +121,12 @@ bool CDBEnv::Open(const fs::path& pathIn, bool retry)
 
     boost::this_thread::interruption_point();
 
+    strPath = pathIn.string();
     if (!LockEnvDirectory(pathIn)) {
+        LogPrintf("Cannot obtain a lock on wallet directory %s. Another instance of bitcoin may be using it.", strPath);
         return false;
     }
 
-    strPath = pathIn.string();
     fs::path pathLogDir = pathIn / "database";
     TryCreateDirectories(pathLogDir);
     fs::path pathErrorFile = pathIn / "db.log";
@@ -310,7 +311,7 @@ bool CDB::VerifyEnvironment(const std::string& walletFile, const fs::path& walle
     }
 
     if (!bitdb.Open(walletDir, true)) {
-        errorStr = strprintf(_("Cannot obtain a lock on wallet directory %s. Another instance of bitcoin may be using it."), walletDir);
+        errorStr = strprintf(_("Error initializing wallet database environment %s!"), walletDir);
         return false;
     }