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

Fix recvclient() to obey max_idle for output, too

Browse source 
recvclient() flushes the output queue before receiving input.  The
receive obeys max_idle, the flush doesn't.

Broken in commit 08b94556 (v4.3.20) "Reimplement max_idle without a
separate thread".  Until then, the idle thread aborted a stuck attempt
to flush output.
This commit is contained in:
Markus Armbruster 2012-03-11 12:35:18 +01:00
parent 7cca82578d
commit 4d59881505
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/lib/player/recvclient.c
View file

@ -81,8 +81,9 @@ recvclient(char *cmd, int size)
* Flush all queued output before potentially sleeping in
* io_input(), to make sure player sees the prompt.
*/
deadline = (time_t)(player->may_sleep >= PLAYER_SLEEP_ON_INPUT
? -1 : 0);
deadline = player->curup + minutes(max_idle);
if (player->may_sleep < PLAYER_SLEEP_ON_INPUT)
deadline = 0;
while (io_output(player->iop, deadline) > 0)
;