Fix how play_cmd() ensures connection close

[empserver] / src / lib / player / login.c

diff --git a/src/lib/player/login.c b/src/lib/player/login.c
index fc002149dfbecface3bf4e023222a71e31c4553f..fd56f531dfa6e34c5a2f11a622779545b108772b 100644 (file)
--- a/src/lib/player/login.c
+++ b/src/lib/player/login.c
@@ -29,7 +29,7 @@
  *  Known contributors to this file:
  *     Dave Pare, 1994
  *     Steve McClure, 2000
- *     Markus Armbruster, 2004-2011
+ *     Markus Armbruster, 2004-2012
  *     Ron Koenderink, 2005-2009
  */
 
@@ -122,7 +122,6 @@ player_login(void *ud)
     }
     player->state = PS_SHUTDOWN;
     pr_id(player, C_EXIT, "so long...\n");
-    while (io_output(player->iop, 1) > 0) ;
     player_delete(player);
     empth_exit();
     /*NOTREACHED*/
@@ -358,7 +357,7 @@ play_cmd(void)
     player->state = PS_PLAYING;
     player_main(player);
     logerror("%s logged out, country #%d", praddr(player), player->cnum);
-    if (CANT_HAPPEN(!io_eof(player->iop)))
+    if (!io_eof(player->iop) && !io_error(player->iop))
        io_set_eof(player->iop);
     return RET_OK;
 }