[Mplayer-cvslog] CVS: main mplayer.c,1.405,1.406

[Richard Felker CVS]

Update of /cvsroot/mplayer/main
In directory mplayer:/var/tmp.root/cvs-serv6931

Modified Files:
	mplayer.c 
Log Message:
fixes bug in alban's new input handling code that caused the terminal
state to get trashed and not restored on exit. hopefully this change
won't interfere with the functionality of the new code; as far as i
can tell it seems to work fine.


Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.405
retrieving revision 1.406
diff -u -r1.405 -r1.406
--- mplayer.c	23 Feb 2002 21:22:54 -0000	1.405
+++ mplayer.c	24 Feb 2002 04:56:54 -0000	1.406
@@ -752,10 +752,13 @@
 
 play_next_file:
 
-if(!use_stdin && !slave_mode){
-  getch2_enable();  // prepare stdin for hotkeys...
-  inited_flags|=INITED_GETCH2;
-}
+// We can enable getch2 *either* here *or* on a per-file basis, but NOT both!!!
+// Doing it both places causes the saved terminal state to get trashed!!
+// Maybe this can be renabled at a later date if it's useful...
+//if(!use_stdin && !slave_mode){
+//  getch2_enable();  // prepare stdin for hotkeys...
+//  inited_flags|=INITED_GETCH2;
+//}
 
 #ifdef HAVE_NEW_GUI
     if ( use_gui ) {