empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't log out player when update aborts a command under Windows

Browse source 
pthread.c's empth_select() returned 1 instead of 0 when empth_wakeup()
interrupted select().  This made io_input() attempt to read input,
which failed with WSAEWOULDBLOCK.  The failure then got propagated all
the way up, and the player got logged out.  Fix by returning 0 in that
case.
This commit is contained in:
Markus Armbruster 2009-07-05 18:56:06 -04:00
parent ee01ac1912
commit 2bfe7a1198
1 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/lib/empthread/ntthread.c
View file

@ -568,6 +568,10 @@ empth_select(int fd, int flags, struct timeval *timeout)
result = WSAWaitForMultipleEvents(2, hEventObject, FALSE, msec, FALSE); result = WSAWaitForMultipleEvents(2, hEventObject, FALSE, msec, FALSE);
switch (result) { switch (result) {
case WSA_WAIT_EVENT_0:
res = 1;
break;
case WSA_WAIT_EVENT_0 + 1:
case WSA_WAIT_TIMEOUT: case WSA_WAIT_TIMEOUT:
res = 0; res = 0;
break; break;
@ -576,7 +580,9 @@ empth_select(int fd, int flags, struct timeval *timeout)
res = -1; res = -1;
break; break;
default: default:
res = 1; CANT_REACH();
errno = EINVAL;
res = -1;
} }
WSAEventSelect(handle, hEventObject[0], 0); WSAEventSelect(handle, hEventObject[0], 0);