Constrain constant values to a single location in code
This commit is contained in:
@@ -660,7 +660,7 @@ int main(int argc, char *argv[])
|
||||
// Subscribe to global signals from core
|
||||
uiInterface.InitMessage.connect(InitMessage);
|
||||
|
||||
if (GetBoolArg("-splash", true) && !GetBoolArg("-min", false))
|
||||
if (GetBoolArg("-splash", DEFAULT_SPLASHSCREEN) && !GetBoolArg("-min", false))
|
||||
app.createSplashScreen(networkStyle.data());
|
||||
|
||||
try
|
||||
|
||||
@@ -162,7 +162,7 @@ void Intro::pickDataDirectory()
|
||||
/* 2) Allow QSettings to override default dir */
|
||||
dataDir = settings.value("strDataDir", dataDir).toString();
|
||||
|
||||
if(!fs::exists(GUIUtil::qstringToBoostPath(dataDir)) || GetBoolArg("-choosedatadir", false))
|
||||
if(!fs::exists(GUIUtil::qstringToBoostPath(dataDir)) || GetBoolArg("-choosedatadir", DEFAULT_CHOOSE_DATADIR))
|
||||
{
|
||||
/* If current default data directory does not exist, let the user choose one */
|
||||
Intro intro;
|
||||
|
||||
@@ -145,7 +145,7 @@ bool PaymentRequestPlus::getMerchant(X509_STORE* certStore, QString& merchant) c
|
||||
int error = X509_STORE_CTX_get_error(store_ctx);
|
||||
// For testing payment requests, we allow self signed root certs!
|
||||
// This option is just shown in the UI options, if -help-debug is enabled.
|
||||
if (!(error == X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT && GetBoolArg("-allowselfsignedrootcertificates", false))) {
|
||||
if (!(error == X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT && GetBoolArg("-allowselfsignedrootcertificates", DEFAULT_SELFSIGNED_ROOTCERTS))) {
|
||||
throw SSLVerifyError(X509_verify_cert_error_string(error));
|
||||
} else {
|
||||
qDebug() << "PaymentRequestPlus::getMerchant: Allowing self signed root certificate, because -allowselfsignedrootcertificates is true.";
|
||||
|
||||
Reference in New Issue
Block a user