summaryrefslogtreecommitdiffstats
path: root/mplayer.c
diff options
context:
space:
mode:
authorrfelker <rfelker@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-02-24 04:56:54 +0000
committerrfelker <rfelker@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-02-24 04:56:54 +0000
commit88f4777bbe4181a771f6143971c3af0bb578e96a (patch)
tree641f95e289aecf16ddc6ca5df4f014a811042502 /mplayer.c
parent03ee5086e5022d1e1c95d8e8df1296572921ee8a (diff)
downloadmpv-88f4777bbe4181a771f6143971c3af0bb578e96a.tar.bz2
mpv-88f4777bbe4181a771f6143971c3af0bb578e96a.tar.xz
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. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4834 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mplayer.c')
-rw-r--r--mplayer.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/mplayer.c b/mplayer.c
index 60eb7ec511..71b64cfa22 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -752,10 +752,13 @@ current_module = NULL;
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 ) {