Merge pull request #2332 from Diapolo/init_messages

harmonize 2 init messages and remove one
This commit is contained in:
Wladimir J. van der Laan 2013-03-19 09:57:57 -07:00
commit b804f1cd56

View file

@ -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()))
{
@ -826,7 +826,7 @@ bool AppInit2()
break;
}
uiInterface.InitMessage(_("Verifying database..."));
uiInterface.InitMessage(_("Verifying blocks..."));
if (!VerifyDB()) {
strLoadError = _("Corrupted block database detected");
break;
@ -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";