diff options
| author | Rudolf Polzer <divverent@xonotic.org> | 2013-03-18 20:33:29 +0100 |
|---|---|---|
| committer | Rudolf Polzer <divverent@xonotic.org> | 2013-03-18 20:33:29 +0100 |
| commit | b1ae33a3554f919dadc37f40a73e0a0f5b3d8203 (patch) | |
| tree | 44ee830bb94555e479bc2752fe2b0288aca7d8e7 | |
| parent | 3ef58d85bab853365689ea2b76b539f9edccd6f7 (diff) | |
| download | mpv-b1ae33a3554f919dadc37f40a73e0a0f5b3d8203.tar.bz2 mpv-b1ae33a3554f919dadc37f40a73e0a0f5b3d8203.tar.xz | |
mp_msg: fix status output disappearing when redirecting INPUT.
Instead, we now check stderr's destination against the foreground tty
for deciding whether we want status output or not.
| -rw-r--r-- | core/mp_msg.c | 4 | ||||
| -rw-r--r-- | osdep/getch2.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/core/mp_msg.c b/core/mp_msg.c index 85cbe9c1fa..58862406fe 100644 --- a/core/mp_msg.c +++ b/core/mp_msg.c @@ -111,8 +111,8 @@ int mp_msg_test(int mod, int lev) { #ifndef __MINGW32__ if (lev == MSGL_STATUS) { - // skip status line output if we are not in the foreground process group - if (tcgetpgrp(0) != getpgrp()) + // skip status line output if stderr is not in the fg process group + if (tcgetpgrp(2) != getpgrp()) return false; } #endif 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 |