diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-05-29 11:45:54 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-05-29 11:46:28 +0200 |
| commit | 67f43a99ae59e24a7f147a27f1d008b8c4e5fc69 (patch) | |
| tree | 779d6ff45fa26c53d74a9dff73953108dfd8ac8f /src/qt | |
| parent | 10e3af352f70452dfc042759d4395ecda752f382 (diff) | |
| parent | d4e1c61212c3f28f80c7184aca81f5d118fad460 (diff) | |
| download | bitcoin-67f43a99ae59e24a7f147a27f1d008b8c4e5fc69.tar.xz | |
Merge pull request #4132
d4e1c61 add DEFAULT_UPNP constant in net (Philip Kaufmann)
Diffstat (limited to 'src/qt')
| -rw-r--r-- | src/qt/optionsmodel.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/qt/optionsmodel.cpp b/src/qt/optionsmodel.cpp index e87a1d97e7..051098315d 100644 --- 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"); |