summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-12-04 20:59:01 +0100
committerwm4 <wm4@nowhere>2014-12-04 22:42:06 +0100
commit6e7942af5062570694e08ee868fb9ee6004f102f (patch)
treed8bf1c3b6e0c0350e487ddd27f887f6a51c3c6ec
parent4979f2f4520ea29c263175c091b81fe851bf87b6 (diff)
downloadmpv-6e7942af5062570694e08ee868fb9ee6004f102f.tar.bz2
mpv-6e7942af5062570694e08ee868fb9ee6004f102f.tar.xz
input: add a hack to fix keyboard navigation with dvd/bd menu
If the user has LEFT/RIGHT/etc. bound in his input.conf, then these were overriding the menu keys in dvdnav mode. This hack works because the dvdnav crap happens to be the only user of MP_INPUT_ON_TOP. If it finds a default key binding in the dvdnav menu section, it will use that, instead of continuing search and possibly finding the user key bindings meant for normal playback.
-rw-r--r--input/input.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/input/input.c b/input/input.c
index 7bb13c5c52..96d99e94f9 100644
--- a/input/input.c
+++ b/input/input.c
@@ -445,6 +445,8 @@ static struct cmd_bind *find_any_bind_for_key(struct input_ctx *ictx,
}
if (s->flags & MP_INPUT_EXCLUSIVE)
break;
+ if (best_bind && (s->flags & MP_INPUT_ON_TOP))
+ break;
}
return best_bind;