Merge pull request #2332 from Diapolo/init_messages
harmonize 2 init messages and remove one
This commit is contained in:
commit
b804f1cd56
1 changed files with 2 additions and 3 deletions
|
@ -608,7 +608,7 @@ bool AppInit2()
|
||||||
|
|
||||||
// ********************************************************* Step 5: verify wallet database integrity
|
// ********************************************************* Step 5: verify wallet database integrity
|
||||||
|
|
||||||
uiInterface.InitMessage(_("Verifying wallet integrity..."));
|
uiInterface.InitMessage(_("Verifying wallet..."));
|
||||||
|
|
||||||
if (!bitdb.Open(GetDataDir()))
|
if (!bitdb.Open(GetDataDir()))
|
||||||
{
|
{
|
||||||
|
@ -826,7 +826,7 @@ bool AppInit2()
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
uiInterface.InitMessage(_("Verifying database..."));
|
uiInterface.InitMessage(_("Verifying blocks..."));
|
||||||
if (!VerifyDB()) {
|
if (!VerifyDB()) {
|
||||||
strLoadError = _("Corrupted block database detected");
|
strLoadError = _("Corrupted block database detected");
|
||||||
break;
|
break;
|
||||||
|
@ -985,7 +985,6 @@ bool AppInit2()
|
||||||
// ********************************************************* Step 9: import blocks
|
// ********************************************************* Step 9: import blocks
|
||||||
|
|
||||||
// scan for better chains in the block chain database, that are not yet connected in the active best chain
|
// 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;
|
CValidationState state;
|
||||||
if (!ConnectBestBlock(state))
|
if (!ConnectBestBlock(state))
|
||||||
strErrors << "Failed to connect best block";
|
strErrors << "Failed to connect best block";
|
||||||
|
|
Loading…
Reference in a new issue