Merge pull request #2186 from Diapolo/misc_stuff

small changes in init, main, checkpoints.h and bitcoin-qt.pro
This commit is contained in:
Wladimir J. van der Laan
2013-02-23 23:52:27 -08:00
5 changed files with 19 additions and 23 deletions

View File

@@ -498,7 +498,7 @@ bool AppInit2()
nScriptCheckThreads = GetArg("-par", 0);
if (nScriptCheckThreads == 0)
nScriptCheckThreads = boost::thread::hardware_concurrency();
if (nScriptCheckThreads <= 1)
if (nScriptCheckThreads <= 1)
nScriptCheckThreads = 0;
else if (nScriptCheckThreads > MAX_SCRIPTCHECK_THREADS)
nScriptCheckThreads = MAX_SCRIPTCHECK_THREADS;