diff options
author | wm4 <wm4@nowhere> | 2014-02-19 15:40:04 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2014-02-19 15:40:04 +0100 |
commit | 57c9f5236a43efd9d979b7ee18a25de2d3d88dd5 (patch) | |
tree | d0403c586f3a59c33282e5187c8a6c553955e01a /player | |
parent | 8b57e4bc1290fd1d6eba7a379e7fa04fc602c945 (diff) | |
download | mpv-57c9f5236a43efd9d979b7ee18a25de2d3d88dd5.tar.bz2 mpv-57c9f5236a43efd9d979b7ee18a25de2d3d88dd5.tar.xz |
input, dvdnav: fix osc stealing input from dvdnav
This is a regression introduced from moving Lua scripts (including the
OSC) to their own threads. Now OSC and dvdnav can add their bindings at
the same time without coordination, which seems to result in the OSC
winning most time, and thus overriding the dvdnav menu bindings.
Fix this by adding a flag that makes dvdnav menu bindings take priority
over all other bindings.
Diffstat (limited to 'player')
-rw-r--r-- | player/dvdnav.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/player/dvdnav.c b/player/dvdnav.c index fd370599c6..5b40f1256f 100644 --- a/player/dvdnav.c +++ b/player/dvdnav.c @@ -164,7 +164,8 @@ void mp_handle_nav(struct MPContext *mpctx) case MP_NAV_EVENT_MENU_MODE: nav->nav_menu = ev->u.menu_mode.enable; if (nav->nav_menu) { - mp_input_enable_section(mpctx->input, "dvdnav-menu", 0); + mp_input_enable_section(mpctx->input, "dvdnav-menu", + MP_INPUT_ON_TOP); } else { mp_input_disable_section(mpctx->input, "dvdnav-menu"); } |