aboutsummaryrefslogtreecommitdiff
path: root/irc.cpp
diff options
context:
space:
mode:
authors_nakamoto <s_nakamoto@1a98c847-1fd6-4fd8-948a-caf3550aa51b>2009-11-06 05:50:05 +0000
committers_nakamoto <s_nakamoto@1a98c847-1fd6-4fd8-948a-caf3550aa51b>2009-11-06 05:50:05 +0000
commit93cfb02acb13b74198b8e0ab72f039313ecf9f1f (patch)
tree87a748950637c99cca980d634ae499085777e2f0 /irc.cpp
parentfba40889418cb1861440a3fdccee048c69f0fb89 (diff)
got rid of CheckForShutdown, replaced some thread-unsafe wxWidgets calls, Linux fixes, socket send MSG_NOSIGNAL, bind INADDR_ANY, works reliably on Linux now except if wxMessageBox is used in a thread other than the GUI thread
Diffstat (limited to 'irc.cpp')
-rw-r--r--irc.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/irc.cpp b/irc.cpp
index 4d4ed0f414..3b232caead 100644
--- a/irc.cpp
+++ b/irc.cpp
@@ -167,9 +167,12 @@ void ThreadIRCSeed(void* parg)
while (!fShutdown)
{
CAddress addrConnect("216.155.130.130:6667");
- struct hostent* phostent = gethostbyname("chat.freenode.net");
- if (phostent && phostent->h_addr_list && phostent->h_addr_list[0])
- addrConnect = CAddress(*(u_long*)phostent->h_addr_list[0], htons(6667));
+ if (!(fUseProxy && addrProxy.port == htons(9050)))
+ {
+ struct hostent* phostent = gethostbyname("chat.freenode.net");
+ if (phostent && phostent->h_addr_list && phostent->h_addr_list[0])
+ addrConnect = CAddress(*(u_long*)phostent->h_addr_list[0], htons(6667));
+ }
SOCKET hSocket;
if (!ConnectSocket(addrConnect, hSocket))