Merge pull request #2095 from al42and/upnp

OptionsModel now has MapPortUPnP=false if UPNP is not supported
This commit is contained in:
Gavin Andresen 2012-12-12 09:31:24 -08:00
commit 278a09a6c6

View file

@ -137,7 +137,11 @@ QVariant OptionsModel::data(const QModelIndex & index, int role) const
case MinimizeToTray: case MinimizeToTray:
return QVariant(fMinimizeToTray); return QVariant(fMinimizeToTray);
case MapPortUPnP: case MapPortUPnP:
#ifdef USE_UPNP
return settings.value("fUseUPnP", GetBoolArg("-upnp", true)); return settings.value("fUseUPnP", GetBoolArg("-upnp", true));
#else
return QVariant(false);
#endif
case MinimizeOnClose: case MinimizeOnClose:
return QVariant(fMinimizeOnClose); return QVariant(fMinimizeOnClose);
case ProxyUse: { case ProxyUse: {