phantom/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-01-11 20:32:35 -03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Allow -upnp to override setting in wallet (and simplify logic a bit)

Browse source
This commit is contained in:
Gavin Andresen 2012-02-01 13:24:15 -05:00
parent 177dbcaace
commit 8beb917c6c
1 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/init.cpp
View file

@ -487,16 +487,11 @@ bool AppInit2(int argc, char* argv[])
fAllowDNS = GetBoolArg("-dns");
fNoListen = GetBoolArg("-nolisten");
if (fHaveUPnP)
{
#if USE_UPNP
if (GetBoolArg("-noupnp"))
fUseUPnP = false;
#else
if (GetBoolArg("-upnp"))
fUseUPnP = true;
#endif
}
// Command-line args override in-wallet settings:
if (mapArgs.count("-upnp"))
fUseUPnP = GetBoolArg("-upnp");
else if (mapArgs.count("-noupnp"))
fUseUPnP = !GetBoolArg("-noupnp");
if (!fNoListen)
{