mirror of
https://github.com/dashpay/dash.git
synced 2024-12-25 20:12:57 +01:00
Merge pull request #2648 from Diapolo/txindex
allow txindex to be removed and add a reindex dialog
This commit is contained in:
commit
e58154c447
11
src/init.cpp
11
src/init.cpp
@ -744,6 +744,12 @@ bool AppInit2(boost::thread_group& threadGroup)
|
|||||||
if (!mapBlockIndex.empty() && pindexGenesisBlock == NULL)
|
if (!mapBlockIndex.empty() && pindexGenesisBlock == NULL)
|
||||||
return InitError(_("Incorrect or no genesis block found. Wrong datadir for network?"));
|
return InitError(_("Incorrect or no genesis block found. Wrong datadir for network?"));
|
||||||
|
|
||||||
|
// Check for changed -txindex state (only necessary if we are not reindexing anyway)
|
||||||
|
if (!fReindex && fTxIndex != GetBoolArg("-txindex", false)) {
|
||||||
|
strLoadError = _("You need to rebuild the database using -reindex to change -txindex");
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
// Initialize the block index (no-op if non-empty database was already loaded)
|
// Initialize the block index (no-op if non-empty database was already loaded)
|
||||||
if (!InitBlockIndex()) {
|
if (!InitBlockIndex()) {
|
||||||
strLoadError = _("Error initializing block database");
|
strLoadError = _("Error initializing block database");
|
||||||
@ -767,7 +773,7 @@ bool AppInit2(boost::thread_group& threadGroup)
|
|||||||
// first suggest a reindex
|
// first suggest a reindex
|
||||||
if (!fReset) {
|
if (!fReset) {
|
||||||
bool fRet = uiInterface.ThreadSafeMessageBox(
|
bool fRet = uiInterface.ThreadSafeMessageBox(
|
||||||
strLoadError + ".\n" + _("Do you want to rebuild the block database now?"),
|
strLoadError + ".\n\n" + _("Do you want to rebuild the block database now?"),
|
||||||
"", CClientUIInterface::MSG_ERROR | CClientUIInterface::BTN_ABORT);
|
"", CClientUIInterface::MSG_ERROR | CClientUIInterface::BTN_ABORT);
|
||||||
if (fRet) {
|
if (fRet) {
|
||||||
fReindex = true;
|
fReindex = true;
|
||||||
@ -781,9 +787,6 @@ bool AppInit2(boost::thread_group& threadGroup)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (mapArgs.count("-txindex") && fTxIndex != GetBoolArg("-txindex", false))
|
|
||||||
return InitError(_("You need to rebuild the databases using -reindex to change -txindex"));
|
|
||||||
|
|
||||||
// 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.
|
||||||
// As the program has not fully started yet, Shutdown() is possibly overkill.
|
// As the program has not fully started yet, Shutdown() is possibly overkill.
|
||||||
|
@ -205,6 +205,6 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Verifying wallet..."),
|
|||||||
QT_TRANSLATE_NOOP("bitcoin-core", "Wallet needed to be rewritten: restart Bitcoin to complete"),
|
QT_TRANSLATE_NOOP("bitcoin-core", "Wallet needed to be rewritten: restart Bitcoin to complete"),
|
||||||
QT_TRANSLATE_NOOP("bitcoin-core", "Warning"),
|
QT_TRANSLATE_NOOP("bitcoin-core", "Warning"),
|
||||||
QT_TRANSLATE_NOOP("bitcoin-core", "Warning: This version is obsolete, upgrade required!"),
|
QT_TRANSLATE_NOOP("bitcoin-core", "Warning: This version is obsolete, upgrade required!"),
|
||||||
QT_TRANSLATE_NOOP("bitcoin-core", "You need to rebuild the databases using -reindex to change -txindex"),
|
QT_TRANSLATE_NOOP("bitcoin-core", "You need to rebuild the database using -reindex to change -txindex"),
|
||||||
QT_TRANSLATE_NOOP("bitcoin-core", "wallet.dat corrupt, salvage failed"),
|
QT_TRANSLATE_NOOP("bitcoin-core", "wallet.dat corrupt, salvage failed"),
|
||||||
};
|
};
|
Loading…
Reference in New Issue
Block a user