Merge pull request #4132

d4e1c61 add DEFAULT_UPNP constant in net (Philip Kaufmann)
2014-05-29 11:45:54 +02:00
parent 10e3af352f d4e1c61212
commit 67f43a99ae
3 changed files with 8 additions and 8 deletions
--- a/src/qt/optionsmodel.cpp
+++ b/src/qt/optionsmodel.cpp
@@ -106,11 +106,7 @@ void OptionsModel::Init()

    // Network
    if (!settings.contains("fUseUPnP"))
-#ifdef USE_UPNP
-        settings.setValue("fUseUPnP", true);
-#else
-        settings.setValue("fUseUPnP", false);
-#endif
+        settings.setValue("fUseUPnP", DEFAULT_UPNP);
    if (!SoftSetBoolArg("-upnp", settings.value("fUseUPnP").toBool()))
        addOverriddenOption("-upnp");