From 514f1d4fc4e9d2aac6780c5fe7d7d7d9f7af4319 Mon Sep 17 00:00:00 2001 From: tokyo4j Date: Mon, 10 Mar 2025 00:00:19 +0900 Subject: [PATCH] menu: assert server->menu_current != NULL in menu_close_root() --- src/menu/menu.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/menu/menu.c b/src/menu/menu.c index f5410ddc..0605b1f6 100644 --- a/src/menu/menu.c +++ b/src/menu/menu.c @@ -1797,11 +1797,11 @@ void menu_close_root(struct server *server) { assert(server->input_mode == LAB_INPUT_STATE_MENU); - if (server->menu_current) { - menu_close(server->menu_current); - server->menu_current = NULL; - destroy_pipemenus(server); - } + assert(server->menu_current); + + menu_close(server->menu_current); + server->menu_current = NULL; + destroy_pipemenus(server); seat_focus_override_end(&server->seat); } -- 2.52.0