diff options
| author | Luke Dashjr <luke-jr+git@utopios.org> | 2012-02-02 20:17:41 -0500 |
|---|---|---|
| committer | Luke Dashjr <luke-jr+git@utopios.org> | 2012-02-02 20:17:41 -0500 |
| commit | 882e00e2159ce5e12170c7c1811236a039d8abfa (patch) | |
| tree | 03e522bdc55f5a11e43c3c2cb2891895ecb704a9 /src/init.cpp | |
| parent | c13d50d8617678c8696b1f33549ed9cc3a0b554e (diff) | |
| parent | c11e2b8679e13f739a58faf2a3439d4aaed24364 (diff) | |
| download | bitcoin-882e00e2159ce5e12170c7c1811236a039d8abfa.tar.xz | |
Merge branch '0.4.x' into 0.5.0.x
Conflicts:
src/main.cpp
Diffstat (limited to 'src/init.cpp')
| -rw-r--r-- | src/init.cpp | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/src/init.cpp b/src/init.cpp index fc171cd48e..f8a63d26de 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -484,16 +484,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) { |