Apply initial filter before evaluating accept-single

This lets us select fully non-interactive if we have a perfect match Signed-off-by: Robert Günzler <r@gnzler.io>
Cloudef · Dec 16, 2022 · 0a44fb6 · 0a44fb6
1 parent 516a2ab
commit 0a44fb6
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/client/common/common.c b/client/common/common.c
@@ -569,6 +569,10 @@ menu_with_options(struct client *client)
 enum bm_run_result
 run_menu(const struct client *client, struct bm_menu *menu, void (*item_cb)(const struct client *client, struct bm_item *item))
 {
+    bm_menu_set_highlighted_index(menu, client->selected);
+    bm_menu_grab_keyboard(menu, true);
+    bm_menu_set_filter(menu, client->initial_filter);
+
     {
     uint32_t total_item_count;
     struct bm_item **items = bm_menu_get_items(menu, &total_item_count);
@@ -584,10 +588,6 @@ run_menu(const struct client *client, struct bm_menu *menu, void (*item_cb)(cons
 
     }
 
-    bm_menu_set_highlighted_index(menu, client->selected);
-    bm_menu_grab_keyboard(menu, true);
-    bm_menu_set_filter(menu, client->initial_filter);
-
     uint32_t unicode;
     enum bm_key key = BM_KEY_NONE;
     struct bm_pointer pointer;