highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-07-04 20:51:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2606 from gavinandresen/threadfix

Browse Source 
Exit cleanly if AppInit2 returns false
This commit is contained in:
Pieter Wuille
2013-05-04 07:43:15 -07:00
parent c9b1baaa29 d605bc4cd1
commit f309cb76c2
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/init.cpp
View File

@ -1041,6 +1041,9 @@ bool AppInit2(boost::thread_group& threadGroup)
if (!CheckDiskSpace())
return false;
if (!strErrors.str().empty())
return InitError(strErrors.str());
RandAddSeedPerfmon();
//// debug print
@ -1062,9 +1065,6 @@ bool AppInit2(boost::thread_group& threadGroup)
uiInterface.InitMessage(_("Done loading"));
if (!strErrors.str().empty())
return InitError(strErrors.str());
// Add wallet transactions that aren't already in a block to mapTransactions
pwalletMain->ReacceptWalletTransactions();