0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed threading bugs

Browse source
This commit is contained in:
Dave White 2004-10-29 22:03:46 +00:00
parent 1334566d95
commit 009dc54817
1 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/network_worker.cpp
View file

@ -180,22 +180,23 @@ void close_socket(TCPsocket sock)
const threading::lock lock(*global_mutex);
const socket_state_map::iterator lock_it = sockets_locked.find(sock);
if(lock_it != sockets_locked.end() && lock_it->second == SOCKET_LOCKED) {
continue;
} else if(lock_it != sockets_locked.end()) {
sockets_locked.erase(lock_it);
}
std::multiset<buffer>::iterator i = bufs.begin();
while(i != bufs.end()) {
if(i->sock == sock) {
bufs.erase(i++);
} else {
++i;
if(lock_it == sockets_locked.end() || lock_it->second != SOCKET_LOCKED) {
if(lock_it != sockets_locked.end()) {
sockets_locked.erase(lock_it);
}
}
return;
std::multiset<buffer>::iterator i = bufs.begin();
while(i != bufs.end()) {
if(i->sock == sock) {
bufs.erase(i++);
} else {
++i;
}
}
break;
}
}
}