Skip to content

Commit

Permalink
Merge pull request #2172 from Diapolo/init_messages
Browse files Browse the repository at this point in the history
make database init messages more valuable
  • Loading branch information
gavinandresen committed Jan 14, 2013
2 parents e4f2b6b + 06494ca commit c83c3cb
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions src/init.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -581,9 +581,9 @@ bool AppInit2()

int64 nStart;

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

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

if (!bitdb.Open(GetDataDir()))
{
Expand Down Expand Up @@ -779,10 +779,12 @@ bool AppInit2()
pblocktree->WriteReindexing(true);

if (!LoadBlockIndex())
return InitError(_("Error loading block/coin databases"));
return InitError(_("Error loading block database"));

uiInterface.InitMessage(_("Verifying block database integrity..."));

if (!VerifyDB())
return InitError(_("Corrupted database detected. Please restart the client with -reindex."));
return InitError(_("Corrupted block database detected. Please restart the client with -reindex."));

// as LoadBlockIndex can take several minutes, it's possible the user
// requested to kill bitcoin-qt during the last operation. If so, exit.
Expand Down

0 comments on commit c83c3cb

Please sign in to comment.