make database init messages more valuable

- it was bad, that quite some messages were just talking about a database,
  I think a user should know, if we are talking about wallet db or
  block/coin db
- also adds a new init message for "Verifying block database integrity..."
This commit is contained in:
Philip Kaufmann 2013-01-11 23:18:00 +01:00
parent 6213b25cd4
commit 06494cabb4

View file

@ -581,9 +581,9 @@ bool AppInit2()
int64 nStart; 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())) if (!bitdb.Open(GetDataDir()))
{ {
@ -752,10 +752,12 @@ bool AppInit2()
pblocktree->WriteReindexing(true); pblocktree->WriteReindexing(true);
if (!LoadBlockIndex()) if (!LoadBlockIndex())
return InitError(_("Error loading block/coin databases")); return InitError(_("Error loading block database"));
uiInterface.InitMessage(_("Verifying block database integrity..."));
if (!VerifyDB()) 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 // as LoadBlockIndex can take several minutes, it's possible the user
// requested to kill bitcoin-qt during the last operation. If so, exit. // requested to kill bitcoin-qt during the last operation. If so, exit.