Merge branch 'obsd-master'

2 files changed, 12 insertions, 9 deletions

diff --git a/control.c b/control.c
index 16fa71bb..c4cf5338 100644
--- a/control.c
+++ b/control.c
@@ -80,6 +80,7 @@ control_callback(struct client *c, int closed, __unused void *data)
 		if (line == NULL)
 			break;
 		if (*line == '\0') { /* empty line exit */
+			free(line);
 			c->flags |= CLIENT_EXIT;
 			break;
 		}
diff --git a/menu.c b/menu.c
index cc21c796..da8d89c4 100644
--- a/menu.c
+++ b/menu.c
@@ -206,8 +206,18 @@ menu_key_cb(struct client *c, struct key_event *event)
 			c->flags |= CLIENT_REDRAWOVERLAY;
 		return (0);
 	}
+	for (i = 0; i < (u_int)count; i++) {
+		name = menu->items[i].name;
+		if (name == NULL || *name == '-')
+			continue;
+		if (event->key == menu->items[i].key) {
+			md->choice = i;
+			goto chosen;
+		}
+	}
 	switch (event->key) {
 	case KEYC_UP:
+	case 'k':
 		if (old == -1)
 			old = 0;
 		do {
@@ -220,6 +230,7 @@ menu_key_cb(struct client *c, struct key_event *event)
 		c->flags |= CLIENT_REDRAWOVERLAY;
 		return (0);
 	case KEYC_DOWN:
+	case 'j':
 		if (old == -1)
 			old = 0;
 		do {
@@ -239,15 +250,6 @@ menu_key_cb(struct client *c, struct key_event *event)
 	case 'q':
 		return (1);
 	}
-	for (i = 0; i < (u_int)count; i++) {
-		name = menu->items[i].name;
-		if (name == NULL || *name == '-')
-			continue;
-		if (event->key == menu->items[i].key) {
-			md->choice = i;
-			goto chosen;
-		}
-	}
 	return (0);
 
 chosen: