highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-01-21 15:50:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

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
committed by Luke Dashjr
parent e5b031f5d2
commit 1b6d8f3fca
1 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/init.cpp
View File

@@ -516,16 +516,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)
{