dash/blackcoin-more
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'upnp' of https://github.com/TheBlueMatt/bitcoin

Browse Source
This commit is contained in:
Gavin Andresen
2011-04-12 14:22:12 -04:00
parent 2e8b33824f 8bb5edc1c9
commit 79706a8e48
30 changed files with 362 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ui.cpp
View File

@@ -1665,6 +1665,10 @@ COptionsDialog::COptionsDialog(wxWindow* parent) : COptionsDialogBase(parent)
m_checkBoxStartOnSystemStartup->SetValue(fTmpStartOnSystemStartup = GetStartOnSystemStartup());
m_checkBoxMinimizeToTray->SetValue(fMinimizeToTray);
m_checkBoxMinimizeOnClose->SetValue(fMinimizeOnClose);
if (fHaveUPnP)
m_checkBoxUseUPnP->SetValue(fUseUPnP);
else
m_checkBoxUseUPnP->Enable(false);
m_checkBoxUseProxy->SetValue(fUseProxy);
m_textCtrlProxyIP->Enable(fUseProxy);
m_textCtrlProxyPort->Enable(fUseProxy);
@@ -1784,6 +1788,13 @@ void COptionsDialog::OnButtonApply(wxCommandEvent& event)
walletdb.WriteSetting("fMinimizeOnClose", fMinimizeOnClose);
}
if (fHaveUPnP && fUseUPnP != m_checkBoxUseUPnP->GetValue())
{
fUseUPnP = m_checkBoxUseUPnP->GetValue();
walletdb.WriteSetting("fUseUPnP", fUseUPnP);
MapPort(fUseUPnP);
}
fUseProxy = m_checkBoxUseProxy->GetValue();
walletdb.WriteSetting("fUseProxy", fUseProxy);