github-jwinterm/myriadcoin
1
0
Fork 0
mirror of https://github.com/jwinterm/myriadcoin.git synced 2026-10-17 05:41:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

name changes

Browse Source
This commit is contained in:
nzsquirrell
2016-03-02 13:44:39 +13:00
parent fadba6489f
commit ba561faa2b
13 changed files with 65 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/init.cpp
+10 -6
View File
@@ -899,7 +899,7 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
// Sanity check
if (!InitSanityCheck())
return InitError(_("Initialization sanity check failed. Myriadcoin Core is shutting down."));
return InitError(_("Initialization sanity check failed. Myriad Core is shutting down."));
std::string strDataDir = GetDataDir().string();
#ifdef ENABLE_WALLET
@@ -915,9 +915,9 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
try {
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. Myriadcoin Core is probably already running."), strDataDir));
return InitError(strprintf(_("Cannot obtain a lock on data directory %s. Myriad Core is probably already running."), strDataDir));
} catch(const boost::interprocess::interprocess_exception& e) {
return InitError(strprintf(_("Cannot obtain a lock on data directory %s. Myriadcoin Core is probably already running.") + " %s.", strDataDir, e.what()));
return InitError(strprintf(_("Cannot obtain a lock on data directory %s. Myriad Core is probably already running.") + " %s.", strDataDir, e.what()));
}
#ifndef WIN32
@@ -926,7 +926,7 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
if (GetBoolArg("-shrinkdebugfile", !fDebug))
ShrinkDebugFile();
LogPrintf("\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n");
LogPrintf("Myriadcoin version %s (%s)\n", FormatFullVersion(), CLIENT_DATE);
LogPrintf("Myriad version %s (%s)\n", FormatFullVersion(), CLIENT_DATE);
LogPrintf("Using OpenSSL version %s\n", SSLeay_version(SSLEAY_VERSION));
#ifdef ENABLE_WALLET
LogPrintf("Using BerkeleyDB version %s\n", DbEnv::version(0, 0, 0));
@@ -964,6 +964,10 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
int64_t nStart;
#if defined(USE_SSE2)
scrypt_detect_sse2();
#endif
// ********************************************************* Step 5: verify wallet database integrity
#ifdef ENABLE_WALLET
if (!fDisableWallet) {
@@ -1283,10 +1287,10 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
InitWarning(msg);
}
else if (nLoadWalletRet == DB_TOO_NEW)
strErrors << _("Error loading wallet.dat: Wallet requires newer version of Myriadcoin Core") << "\n";
strErrors << _("Error loading wallet.dat: Wallet requires newer version of Myriad Core") << "\n";
else if (nLoadWalletRet == DB_NEED_REWRITE)
{
strErrors << _("Wallet needed to be rewritten: restart Myriadcoin Core to complete") << "\n";
strErrors << _("Wallet needed to be rewritten: restart Myriad Core to complete") << "\n";
LogPrintf("%s", strErrors.str());
return InitError(strErrors.str());
}