diff options
| author | Gavin Andresen <[email protected]> | 2012-12-12 09:31:24 -0800 |
|---|---|---|
| committer | Gavin Andresen <[email protected]> | 2012-12-12 09:31:24 -0800 |
| commit | 278a09a6c62decbd537af22cc41fd2dd1f49183d (patch) | |
| tree | 146b940d4dac2961dc3c3ddfd7e4d620700c7282 /src | |
| parent | Merge pull request #2003 from alexanderkjeldaas/documented-locking-part-2 (diff) | |
| parent | OptionsModel now has MapPortUPnP=false if UPNP is not supported (diff) | |
| download | discoin-278a09a6c62decbd537af22cc41fd2dd1f49183d.tar.xz discoin-278a09a6c62decbd537af22cc41fd2dd1f49183d.zip | |
Merge pull request #2095 from al42and/upnp
OptionsModel now has MapPortUPnP=false if UPNP is not supported
Diffstat (limited to 'src')
| -rw-r--r-- | src/qt/optionsmodel.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/qt/optionsmodel.cpp b/src/qt/optionsmodel.cpp index e3c9413f1..5dac5a6c4 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: { |