aboutsummaryrefslogtreecommitdiff
path: root/gui/src/optionsdialog.cpp
diff options
context:
space:
mode:
authorWladimir J. van der Laan <[email protected]>2011-06-05 16:11:44 +0200
committerWladimir J. van der Laan <[email protected]>2011-06-05 16:11:44 +0200
commit9e0576587b91e67aaad3bd4b61571c3fdeeceda7 (patch)
tree1603e384aa2ea58d943b995c7db27a039db20635 /gui/src/optionsdialog.cpp
parentcomment update (diff)
parentshow messages from core/net thread (diff)
downloaddiscoin-9e0576587b91e67aaad3bd4b61571c3fdeeceda7.tar.xz
discoin-9e0576587b91e67aaad3bd4b61571c3fdeeceda7.zip
Merge branch 'master' of ssh://amethyst/home/orion/projects2/bitcoin/bitcoin-qt
Diffstat (limited to 'gui/src/optionsdialog.cpp')
-rw-r--r--gui/src/optionsdialog.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/gui/src/optionsdialog.cpp b/gui/src/optionsdialog.cpp
index 8e7f403a7..1ec777c45 100644
--- a/gui/src/optionsdialog.cpp
+++ b/gui/src/optionsdialog.cpp
@@ -207,6 +207,10 @@ MainOptionsPage::MainOptionsPage(QWidget *parent):
connect(connect_socks4, SIGNAL(toggled(bool)), proxy_ip, SLOT(setEnabled(bool)));
connect(connect_socks4, SIGNAL(toggled(bool)), proxy_port, SLOT(setEnabled(bool)));
+
+#ifndef USE_UPNP
+ map_port_upnp->setDisabled(true);
+#endif
}
void MainOptionsPage::setMapper(MonitoredDataMapper *mapper)