From 93cfb02acb13b74198b8e0ab72f039313ecf9f1f Mon Sep 17 00:00:00 2001 From: s_nakamoto Date: Fri, 6 Nov 2009 05:50:05 +0000 Subject: 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 --- irc.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'irc.cpp') 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)) -- cgit v1.2.3