]> git.mdlowis.com Git - proto/labwc.git/commitdiff
menu: assert server->menu_current != NULL in menu_close_root()
authortokyo4j <hrak1529@gmail.com>
Sun, 9 Mar 2025 15:00:19 +0000 (00:00 +0900)
committerHiroaki Yamamoto <hrak1529@gmail.com>
Mon, 10 Mar 2025 07:16:20 +0000 (16:16 +0900)
src/menu/menu.c

index f5410ddc0a607a64e60c8a0789d110460881d7f8..0605b1f6d7636cacfca3e21567b1ea2f460b40fb 100644 (file)
@@ -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);
 }