|
|
|
@ -315,11 +315,9 @@ void BitcoinApplication::parameterSetup()
|
|
|
|
|
InitParameterInteraction(gArgs);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void BitcoinApplication::InitializePruneSetting(bool prune)
|
|
|
|
|
void BitcoinApplication::InitPruneSetting(int64_t prune_MiB)
|
|
|
|
|
{
|
|
|
|
|
// If prune is set, intentionally override existing prune size with
|
|
|
|
|
// the default size since this is called when choosing a new datadir.
|
|
|
|
|
optionsModel->SetPruneTargetGB(prune ? DEFAULT_PRUNE_TARGET_GB : 0, true);
|
|
|
|
|
optionsModel->SetPruneTargetGB(PruneMiBtoGB(prune_MiB), true);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void BitcoinApplication::requestInitialize()
|
|
|
|
@ -508,9 +506,9 @@ int GuiMain(int argc, char* argv[])
|
|
|
|
|
/// 5. Now that settings and translations are available, ask user for data directory
|
|
|
|
|
// User language is set up: pick a data directory
|
|
|
|
|
bool did_show_intro = false;
|
|
|
|
|
bool prune = false; // Intro dialog prune check box
|
|
|
|
|
int64_t prune_MiB = 0; // Intro dialog prune configuration
|
|
|
|
|
// Gracefully exit if the user cancels
|
|
|
|
|
if (!Intro::showIfNeeded(did_show_intro, prune)) return EXIT_SUCCESS;
|
|
|
|
|
if (!Intro::showIfNeeded(did_show_intro, prune_MiB)) return EXIT_SUCCESS;
|
|
|
|
|
|
|
|
|
|
/// 6. Determine availability of data directory and parse bitcoin.conf
|
|
|
|
|
/// - Do not call GetDataDir(true) before this step finishes
|
|
|
|
@ -594,7 +592,7 @@ int GuiMain(int argc, char* argv[])
|
|
|
|
|
|
|
|
|
|
if (did_show_intro) {
|
|
|
|
|
// Store intro dialog settings other than datadir (network specific)
|
|
|
|
|
app.InitializePruneSetting(prune);
|
|
|
|
|
app.InitPruneSetting(prune_MiB);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (gArgs.GetBoolArg("-splash", DEFAULT_SPLASHSCREEN) && !gArgs.GetBoolArg("-min", false))
|
|
|
|
|