Mercurial > hg > bitcoin
changeset 3613:7a89f38d8aab draft
Fix bad merge, pszDataDir duplication
author | Gavin Andresen <gavinandresen@gmail.com> |
---|---|
date | Tue, 09 Oct 2012 12:28:00 -0400 |
parents | e34485ae790c |
children | 9c994f46fca6 |
files | src/init.cpp |
diffstat | 1 files changed, 0 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/init.cpp +++ b/src/init.cpp @@ -447,7 +447,6 @@ 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));