highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-11-13 07:28:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

bitcoind changes to stop storing settings in wallet.dat.

Browse Source
This commit is contained in:
Gavin Andresen
2012-02-16 15:00:16 -05:00
committed by Pieter Wuille
parent 4a10d4c6dc
commit 972060ce0e
7 changed files with 34 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/init.cpp
View File

@@ -473,8 +473,6 @@ bool AppInit2(int argc, char* argv[])
return false;
}
fGenerateBitcoins = GetBoolArg("-gen");
if (mapArgs.count("-proxy"))
{
fUseProxy = true;
@@ -520,13 +518,6 @@ bool AppInit2(int argc, char* argv[])
COINBASE_FLAGS << std::vector<unsigned char>(pszP2SH, pszP2SH+strlen(pszP2SH));
}
// Command-line args override in-wallet settings:
#if USE_UPNP
fUseUPnP = GetBoolArg("-upnp", true);
#else
fUseUPnP = GetBoolArg("-upnp", false);
#endif
if (!fNoListen)
{
std::string strError;