commit 79ae152697ed0dfa578cfac305d05021dec2a6bc
author zeertzjq <zeertzjq@outlook.com> Fri Jul 01 12:13:15 2022 +0100
committer Bram Moolenaar <Bram@vim.org> Fri Jul 01 12:13:15 2022 +0100
tree 3df65276f11979b8b35c33dcde4c2525a6d76815
parent 9610f94510220c783328e1857af87a6ae7bc20b4

patch 9.0.0015: with EXITFREE defined terminal menus are not cleared

Problem:    With EXITFREE defined terminal menus are not cleared.
Solution:   Also clear terminal menus. Remove condition that is always true.
            (closes #10641)

src/menu.c

diff --git a/src/menu.c b/src/menu.c
index a588674..bfad016 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -2361,11 +2361,10 @@
     }
 
     // For the WinBar menu always use the Normal mode menu.
-    if (idx == -1 || eap == NULL)
+    if (idx == MENU_INDEX_INVALID || eap == NULL)
 	idx = MENU_INDEX_NORMAL;
 
-    if (idx != MENU_INDEX_INVALID && menu->strings[idx] != NULL
-						 && (menu->modes & (1 << idx)))
+    if (menu->strings[idx] != NULL && (menu->modes & (1 << idx)))
     {
 	// When executing a script or function execute the commands right now.
 	// Also for the window toolbar.