Browse Source

Merge pull request #3806

9e2872c Adjust branding in datadir lock error message (Michagogo)
d30d379 Slightly tweak error when unable to bind port (Michagogo)
tags/v0.15.1
Wladimir J. van der Laan 6 years ago
parent
commit
fc5d85c4bb
No account linked to committer's email address
2 changed files with 2 additions and 2 deletions
  1. 1
    1
      src/init.cpp
  2. 1
    1
      src/net.cpp

+ 1
- 1
src/init.cpp View File

@@ -568,7 +568,7 @@ bool AppInit2(boost::thread_group& threadGroup)
if (file) fclose(file);
static boost::interprocess::file_lock lock(pathLockFile.string().c_str());
if (!lock.try_lock())
return InitError(strprintf(_("Cannot obtain a lock on data directory %s. Bitcoin is probably already running."), strDataDir));
return InitError(strprintf(_("Cannot obtain a lock on data directory %s. Bitcoin Core is probably already running."), strDataDir));

if (GetBoolArg("-shrinkdebugfile", !fDebug))
ShrinkDebugFile();

+ 1
- 1
src/net.cpp View File

@@ -1653,7 +1653,7 @@ bool BindListenPort(const CService &addrBind, string& strError)
{
int nErr = WSAGetLastError();
if (nErr == WSAEADDRINUSE)
strError = strprintf(_("Unable to bind to %s on this computer. Bitcoin Core Daemon is probably already running."), addrBind.ToString());
strError = strprintf(_("Unable to bind to %s on this computer. Bitcoin Core is probably already running."), addrBind.ToString());
else
strError = strprintf(_("Unable to bind to %s on this computer (bind returned error %d, %s)"), addrBind.ToString(), nErr, strerror(nErr));
LogPrintf("%s\n", strError);

Loading…
Cancel
Save