mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-02-09 10:43:19 -05:00
Fix bad merge, pszDataDir duplication
This commit is contained in:
parent
673021410f
commit
de038acd96
1 changed files with 0 additions and 1 deletions
|
@ -447,7 +447,6 @@ bool AppInit2()
|
|||
FILE* file = fopen(pathLockFile.string().c_str(), "a"); // empty lock file; created if it doesn't exist.
|
||||
if (file) fclose(file);
|
||||
static boost::interprocess::file_lock lock(pathLockFile.string().c_str());
|
||||
const char* pszDataDir = GetDataDir().string().c_str();
|
||||
if (!lock.try_lock())
|
||||
return InitError(strprintf(_("Cannot obtain a lock on data directory %s. Bitcoin is probably already running."), pszDataDir));
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue