From: tokyo4j <hrak1529@gmail.com>
Date: Sun, 9 Mar 2025 15:00:19 +0000 (+0900)
Subject: menu: assert server->menu_current != NULL in menu_close_root()
X-Git-Url: https://git.mdlowis.com/?a=commitdiff_plain;h=514f1d4fc4e9d2aac6780c5fe7d7d7d9f7af4319;p=proto%2Flabwc.git

menu: assert server->menu_current != NULL in menu_close_root()
---

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);
 }