diff options
| author | wm4 <wm4@nowhere> | 2013-04-30 00:52:32 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-04-30 00:52:32 +0200 |
| commit | ea7b920184a865a3343001318fc4a32dcfc7b4f5 (patch) | |
| tree | fbefd8539b77ee7473ad73740cc8ffa97bc4ffbe /osdep/getch2.c | |
| parent | 3dcc83a70609d392c8ecd917dd5c16995424e9c4 (diff) | |
| parent | d98e61ea438db66323734ad1b6bea66411a3c97b (diff) | |
| download | mpv-ea7b920184a865a3343001318fc4a32dcfc7b4f5.tar.bz2 mpv-ea7b920184a865a3343001318fc4a32dcfc7b4f5.tar.xz | |
Merge branch 'master' into low_quality_intel_crap
Conflicts:
video/out/gl_video_shaders.glsl
video/out/vo_opengl.c
Diffstat (limited to 'osdep/getch2.c')
| -rw-r--r-- | osdep/getch2.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/osdep/getch2.c b/osdep/getch2.c index d9966d57ed..ae6a04f389 100644 --- a/osdep/getch2.c +++ b/osdep/getch2.c @@ -340,10 +340,10 @@ void getch2_poll(void){ if (!getch2_enabled) return; - // check if we are in the foreground process group + // check if stdin is in the foreground process group int newstatus = (tcgetpgrp(0) == getpgrp()); - // and activate getch2 if we are, deactivate otherwise + // and activate getch2 if it is, deactivate otherwise if (newstatus) do_activate_getch2(); else |