Permalink
Browse files

Fix bad merge, pszDataDir duplication

  • Loading branch information...
1 parent 6730214 commit de038acd96ca86f624336f372808d29b9c9f23fd @gavinandresen gavinandresen committed Oct 9, 2012
Showing with 0 additions and 1 deletion.
  1. +0 −1 src/init.cpp
View
@@ -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));

0 comments on commit de038ac

Please sign in to comment.