From 0c6d85f6c36703d5e6fe1c2696fb4376cee5b46e Mon Sep 17 00:00:00 2001 From: wm4 Date: Wed, 3 Dec 2014 15:44:41 +0100 Subject: input, lua: make removing key bindings work This just kept adding bindings to the input section, rather than defining it. One bad effect was that mp.remove_key_binding() in Lua didn't work. --- input/input.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'input') diff --git a/input/input.c b/input/input.c index c624e7de67..7bb13c5c52 100644 --- a/input/input.c +++ b/input/input.c @@ -1019,14 +1019,15 @@ void mp_input_define_section(struct input_ctx *ictx, char *name, char *location, if (!name || !name[0]) return; // parse_config() changes semantics with restrict_section==empty input_lock(ictx); + // Delete: + struct cmd_bind_section *bs = get_bind_section(ictx, bstr0(name)); + remove_binds(bs, builtin); if (contents) { + // Redefine: parse_config(ictx, builtin, bstr0(contents), location, name); } else { // Disable: mp_input_disable_section(ictx, name); - // Delete: - struct cmd_bind_section *bs = get_bind_section(ictx, bstr0(name)); - remove_binds(bs, builtin); } input_unlock(ictx); } -- cgit v1.2.3