sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-27 04:52:59 +01:00
Code Issues Actions 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
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"); fAllowDNS = GetBoolArg("-dns");
fNoListen = GetBoolArg("-nolisten"); fNoListen = GetBoolArg("-nolisten");
if (fHaveUPnP) // Command-line args override in-wallet settings:
{ if (mapArgs.count("-upnp"))
#if USE_UPNP fUseUPnP = GetBoolArg("-upnp");
if (GetBoolArg("-noupnp")) else if (mapArgs.count("-noupnp"))
fUseUPnP = false; fUseUPnP = !GetBoolArg("-noupnp");
#else
if (GetBoolArg("-upnp"))
fUseUPnP = true;
#endif
}
if (!fNoListen) if (!fNoListen)
{ {