aboutsummaryrefslogtreecommitdiff
path: root/src/init.cpp
diff options
context:
space:
mode:
authorGavin Andresen <gavinandresen@gmail.com>2012-02-16 15:00:16 -0500
committerPieter Wuille <pieter.wuille@gmail.com>2012-02-26 23:21:33 +0100
commit972060ce0e9746c979ce0ddeeb997121414c1d58 (patch)
tree9c676a8281e62513e9ee4b5f68e01a197dc6edf2 /src/init.cpp
parent4a10d4c6dcd04eb2496257754782150793ce53b1 (diff)
bitcoind changes to stop storing settings in wallet.dat.
Diffstat (limited to 'src/init.cpp')
-rw-r--r--src/init.cpp9
1 files changed, 0 insertions, 9 deletions
diff --git a/src/init.cpp b/src/init.cpp
index 3a8fcdf524..b701e90e91 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -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;