diff options
| author | Pieter Wuille <[email protected]> | 2015-11-28 22:12:33 +0100 |
|---|---|---|
| committer | Pieter Wuille <[email protected]> | 2015-11-28 22:15:23 +0100 |
| commit | 8d26289c9a7c77c7e5cecaafebe0231cb4d69fbe (patch) | |
| tree | be57e0918417600e4a758f02338f479946bb2721 /src/qt/paymentrequestplus.cpp | |
| parent | Merge pull request #6942 (diff) | |
| parent | [qt] Move GUI related HelpMessage() part downstream (diff) | |
| download | discoin-8d26289c9a7c77c7e5cecaafebe0231cb4d69fbe.tar.xz discoin-8d26289c9a7c77c7e5cecaafebe0231cb4d69fbe.zip | |
Merge pull request #6961
fa41d4c [qt] Move GUI related HelpMessage() part downstream (MarcoFalke)
faf93f3 [trivial] Reuse translation and cleanup DEFAULT_* values (MarcoFalke)
3307bdb Bugfix: Omit wallet-related options from -help when wallet is not supported (Luke Dashjr)
b966aa8 Constrain constant values to a single location in code (Luke Dashjr)
Diffstat (limited to 'src/qt/paymentrequestplus.cpp')
| -rw-r--r-- | src/qt/paymentrequestplus.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qt/paymentrequestplus.cpp b/src/qt/paymentrequestplus.cpp index 78a783dea..1f54c62b6 100644 --- a/src/qt/paymentrequestplus.cpp +++ b/src/qt/paymentrequestplus.cpp @@ -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."; |