summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDaniel Friesel <derf@finalrewind.org>2016-05-27 19:08:24 +0200
committerDaniel Friesel <derf@finalrewind.org>2016-05-27 19:08:24 +0200
commit315bac4637537654b4711867911458c3a6974c7e (patch)
tree6e0a0d14de68f22bc4e641188040188351b9f332 /src
parentf13f1c3bc1da3b29726f4acb34b5e9449036fb1d (diff)
events/keyevents: zero cur_bb/cur_kb on each iteration
previously, a button/key definition with an invalid action name would assign the specified key to the most recent valid action. E.g. "zoom_in 4\ninvalid 5" wuold assign button 5 to zoom_in.
Diffstat (limited to 'src')
-rw-r--r--src/events.c1
-rw-r--r--src/keyevents.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/src/events.c b/src/events.c
index c5032a1..23a14ba 100644
--- a/src/events.c
+++ b/src/events.c
@@ -128,6 +128,7 @@ void init_buttonbindings(void)
while (fgets(line, sizeof(line), conf)) {
*action = '\0';
*button = '\0';
+ cur_bb = NULL;
read = sscanf(line, "%31s %7s\n", (char *) &action, (char *) &button);
diff --git a/src/keyevents.c b/src/keyevents.c
index ba15a5d..8977111 100644
--- a/src/keyevents.c
+++ b/src/keyevents.c
@@ -178,6 +178,7 @@ void init_keyevents(void) {
*k1 = '\0';
*k2 = '\0';
*k3 = '\0';
+ cur_kb = NULL;
read = sscanf(line, "%31s %31s %31s %31s\n",
(char *) &action, (char *) &k1, (char* ) &k2, (char *) &k3);