summaryrefslogtreecommitdiffstats
path: root/input
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-12-04 20:59:01 +0100
committerAlessandro Ghedini <alessandro@ghedini.me>2014-12-07 23:56:25 +0100
commit63a31db0a3f7898b738e60d823efdf38c1c1087c (patch)
tree73225785088b5ddaa5a57923c79e831758c33757 /input
parent575edecccb9d04b82e19c174fee309ef0acc3064 (diff)
downloadmpv-63a31db0a3f7898b738e60d823efdf38c1c1087c.tar.bz2
mpv-63a31db0a3f7898b738e60d823efdf38c1c1087c.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.
Diffstat (limited to 'input')
-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;