diff options
| author | Gavin Andresen <gavinandresen@gmail.com> | 2012-10-09 12:28:00 -0400 |
|---|---|---|
| committer | Gavin Andresen <gavinandresen@gmail.com> | 2012-10-09 12:28:00 -0400 |
| commit | de038acd96ca86f624336f372808d29b9c9f23fd (patch) | |
| tree | 3231ea7d0b8ac9c3db92c1e51834321e804b55c6 | |
| parent | 673021410f48db3ad664d5c0dbf3a480ec0a0106 (diff) | |
| download | bitcoin-de038acd96ca86f624336f372808d29b9c9f23fd.tar.xz | |
Fix bad merge, pszDataDir duplication
| -rw-r--r-- | src/init.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/init.cpp b/src/init.cpp index e491652382..bdddc631da 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -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)); |