diff options
| author | George Hazan <george.hazan@gmail.com> | 2015-06-04 13:32:26 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2015-06-04 13:32:26 +0000 |
| commit | 8b8283c62cc5b8fce419fd7e0fe38c33f4457e17 (patch) | |
| tree | 13754815e57a1d7a119078624077ee6ad8b07caa /protocols/MSN/src/msn_natdetect.cpp | |
| parent | d3087e6da133a1c0b7e6e63f4e6f54c027b9f58c (diff) | |
fix for MSN avatars thread hangup
git-svn-id: http://svn.miranda-ng.org/main/trunk@13998 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/MSN/src/msn_natdetect.cpp')
| -rw-r--r-- | protocols/MSN/src/msn_natdetect.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/protocols/MSN/src/msn_natdetect.cpp b/protocols/MSN/src/msn_natdetect.cpp index 5458b2853b..18e3a5746e 100644 --- a/protocols/MSN/src/msn_natdetect.cpp +++ b/protocols/MSN/src/msn_natdetect.cpp @@ -76,7 +76,7 @@ static void DiscardExtraPackets(SOCKET s) unsigned buf;
for (;;) {
- if (Miranda_Terminated()) break;
+ if (g_bTerminated) break;
fd_set fd;
FD_ZERO(&fd);
@@ -142,7 +142,7 @@ void CMsnProto::MSNatDetect(void) // NAT detection
unsigned i;
for (i = 0; i < 4; ++i) {
- if (Miranda_Terminated()) break;
+ if (g_bTerminated) break;
// Send echo request to server 1
debugLogA("P2PNAT Request 1 attempt %d sent", i);
@@ -207,7 +207,7 @@ void CMsnProto::MSNatDetect(void) addr2.sin_addr.S_un.S_addr = rpkt.testIP;
addr2.sin_port = rpkt.discardPort;
for (i = 0; i < 4; ++i) {
- if (Miranda_Terminated()) break;
+ if (g_bTerminated) break;
debugLogA("P2PNAT Request 2 attempt %d sent", i);
// Remove IP restriction for server 2
@@ -243,7 +243,7 @@ void CMsnProto::MSNatDetect(void) // Symmetric NAT detection
addr2.sin_port = rpkt.testPort;
for (i = 0; i < 4; ++i) {
- if (Miranda_Terminated()) break;
+ if (g_bTerminated) break;
debugLogA("P2PNAT Request 3 attempt %d sent", i);
// Send echo request to server 1
|