diff --git a/dgamelaunch.c b/dgamelaunch.c
index 4003dee..15246cd 100644
--- a/dgamelaunch.c
+++ b/dgamelaunch.c
@@ -1746,14 +1746,14 @@ main (int argc, char** argv)
   /* for chroot and program execution */
   char atrcfilename[81], *spool, *p, *auth = NULL;
   unsigned int len;
-  int c;
+  int c, i;
   int nhext = 0, nhauth = 0;
   int userchoice;
 
 #ifndef HAVE_SETPROCTITLE
   /* save argc, argv */
   char** saved_argv;
-  int saved_argc, i;
+  int saved_argc;
 
   saved_argc = argc;
 
diff --git a/ttyplay.c b/ttyplay.c
index 058cec2..176fcd9 100644
--- a/ttyplay.c
+++ b/ttyplay.c
@@ -148,6 +148,7 @@ ttypread (FILE * fp, Header * h, char **buf, int pread)
   static int kq = -1;
 #endif
   struct timeval w = { 0, 100000 };
+  struct timeval origw = { 0, 100000 };
   int counter = 0;
   fd_set readfs;
   struct termios t;
@@ -209,6 +210,7 @@ ttypread (FILE * fp, Header * h, char **buf, int pread)
 	FD_ZERO (&readfs);
 	FD_SET (STDIN_FILENO, &readfs);
 	n = select (1, &readfs, NULL, NULL, &w);
+	w = origw;
 	doread = n >= 1 && FD_ISSET (0, &readfs);
       }
       if (n == -1)