Merge pull request #451 from TheBlueMatt/tornolisten
Don't listen if on TOR (resolves #441).
This commit is contained in:
commit
32de8cd062
3 changed files with 4 additions and 3 deletions
|
@ -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>
|
||||
|
|
|
@ -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++)
|
||||
|
|
|
@ -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 );
|
||||
|
|
Loading…
Reference in a new issue