Skip to content

Commit

Permalink
Merge pull request bitcoin#2332 from Diapolo/init_messages
Browse files Browse the repository at this point in the history
harmonize 2 init messages and remove one
  • Loading branch information
laanwj committed Mar 19, 2013
2 parents db725e6 + e1ca89d commit b804f1c
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions src/init.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -608,7 +608,7 @@ bool AppInit2()

// ********************************************************* Step 5: verify wallet database integrity

uiInterface.InitMessage(_("Verifying wallet integrity..."));
uiInterface.InitMessage(_("Verifying wallet..."));

if (!bitdb.Open(GetDataDir()))
{
Expand Down Expand Up @@ -826,7 +826,7 @@ bool AppInit2()
break;
}

uiInterface.InitMessage(_("Verifying database..."));
uiInterface.InitMessage(_("Verifying blocks..."));
if (!VerifyDB()) {
strLoadError = _("Corrupted block database detected");
break;
Expand Down Expand Up @@ -985,7 +985,6 @@ bool AppInit2()
// ********************************************************* Step 9: import blocks

// scan for better chains in the block chain database, that are not yet connected in the active best chain
uiInterface.InitMessage(_("Importing blocks from block database..."));
CValidationState state;
if (!ConnectBestBlock(state))
strErrors << "Failed to connect best block";
Expand Down

0 comments on commit b804f1c

Please sign in to comment.