highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-04-04 12:55:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

[wallet] Introduce DEFAULT_DISABLE_WALLET

Browse Source
This commit is contained in:
MarcoFalke
2016-09-21 12:15:18 +02:00
parent fab91070d3
commit fa58edbffe
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/wallet/wallet.cpp
View File

@@ -414,7 +414,7 @@ void CWallet::Flush(bool shutdown)
bool CWallet::Verify()
{
if (GetBoolArg("-disablewallet", false))
if (GetBoolArg("-disablewallet", DEFAULT_DISABLE_WALLET))
return true;
LogPrintf("Using BerkeleyDB version %s\n", DbEnv::version(0, 0, 0));
@@ -3296,7 +3296,7 @@ std::string CWallet::GetWalletHelpString(bool showDebug)
bool CWallet::InitLoadWallet()
{
if (GetBoolArg("-disablewallet", false)) {
if (GetBoolArg("-disablewallet", DEFAULT_DISABLE_WALLET)) {
pwalletMain = NULL;
LogPrintf("Wallet disabled!\n");
return true;
@@ -3473,7 +3473,7 @@ bool CWallet::InitLoadWallet()
bool CWallet::ParameterInteraction()
{
if (GetBoolArg("-disablewallet", false))
if (GetBoolArg("-disablewallet", DEFAULT_DISABLE_WALLET))
return true;
if (GetBoolArg("-blocksonly", DEFAULT_BLOCKSONLY) && SoftSetBoolArg("-walletbroadcast", false)) {