aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGavin Andresen <gavinandresen@gmail.com>2012-12-12 09:31:24 -0800
committerGavin Andresen <gavinandresen@gmail.com>2012-12-12 09:31:24 -0800
commit278a09a6c62decbd537af22cc41fd2dd1f49183d (patch)
tree146b940d4dac2961dc3c3ddfd7e4d620700c7282
parent8a7277a578463a647664b068b6b7b69cf09cda57 (diff)
parent6a3aef39e70e6da81cbd2484c1721d44f9b02d9a (diff)
Merge pull request #2095 from al42and/upnp
OptionsModel now has MapPortUPnP=false if UPNP is not supported
-rw-r--r--src/qt/optionsmodel.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/qt/optionsmodel.cpp b/src/qt/optionsmodel.cpp
index e3c9413f1b..5dac5a6c45 100644
--- a/src/qt/optionsmodel.cpp
+++ b/src/qt/optionsmodel.cpp
@@ -137,7 +137,11 @@ QVariant OptionsModel::data(const QModelIndex & index, int role) const
case MinimizeToTray:
return QVariant(fMinimizeToTray);
case MapPortUPnP:
+#ifdef USE_UPNP
return settings.value("fUseUPnP", GetBoolArg("-upnp", true));
+#else
+ return QVariant(false);
+#endif
case MinimizeOnClose:
return QVariant(fMinimizeOnClose);
case ProxyUse: {