diff options
| author | Jeff Garzik <jgarzik@exmulti.com> | 2011-08-04 11:40:06 -0700 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@exmulti.com> | 2011-08-04 11:40:06 -0700 |
| commit | 32de8cd062df3df5c34922d262484b934024eb06 (patch) | |
| tree | fe8e7bdd9cd4a0a396b889cef23580b73a114edf | |
| parent | ce364b2d7aba6b7802471a30148f221b26a4ab38 (diff) | |
| parent | 01a509fa2616537a4b444966d6e4e451822b2abd (diff) | |
Merge pull request #451 from TheBlueMatt/tornolisten
Don't listen if on TOR (resolves #441).
| -rw-r--r-- | share/uiproject.fbp | 2 | ||||
| -rw-r--r-- | src/init.cpp | 3 | ||||
| -rw-r--r-- | src/uibase.cpp | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/share/uiproject.fbp b/share/uiproject.fbp index d5e6b1e36b..7d2c258415 100644 --- a/share/uiproject.fbp +++ b/share/uiproject.fbp @@ -2090,7 +2090,7 @@ <property name="font"></property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
- <property name="label">&Connect through socks4 proxy: </property>
+ <property name="label">&Connect through socks4 proxy (requires restart to apply): </property>
<property name="maximum_size"></property>
<property name="minimum_size"></property>
<property name="name">m_checkBoxUseProxy</property>
diff --git a/src/init.cpp b/src/init.cpp index 266c992028..acfcc44d10 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -247,7 +247,8 @@ bool AppInit2(int argc, char* argv[]) fPrintToDebugger = GetBoolArg("-printtodebugger"); fTestNet = GetBoolArg("-testnet"); - fNoListen = GetBoolArg("-nolisten"); + bool fTOR = (fUseProxy && addrProxy.port == htons(9050)); + fNoListen = GetBoolArg("-nolisten") || fTOR; fLogTimestamps = GetBoolArg("-logtimestamps"); for (int i = 1; i < argc; i++) diff --git a/src/uibase.cpp b/src/uibase.cpp index 18eec44138..6d219ad667 100644 --- a/src/uibase.cpp +++ b/src/uibase.cpp @@ -367,7 +367,7 @@ COptionsDialogBase::COptionsDialogBase( wxWindow* parent, wxWindowID id, const w wxBoxSizer* bSizer102; bSizer102 = new wxBoxSizer( wxHORIZONTAL ); - m_checkBoxUseProxy = new wxCheckBox( m_panelMain, wxID_ANY, _("&Connect through socks4 proxy: "), wxDefaultPosition, wxDefaultSize, 0 ); + m_checkBoxUseProxy = new wxCheckBox( m_panelMain, wxID_ANY, _("&Connect through socks4 proxy (requires restart to apply): "), wxDefaultPosition, wxDefaultSize, 0 ); bSizer102->Add( m_checkBoxUseProxy, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); bSizer69->Add( bSizer102, 1, wxEXPAND, 5 ); |