[PATCH 1/1] win32u: Reset focused item when removing menu item

[Vladislav Timonin]

From: Vladislav Timonin

---
 dlls/win32u/menu.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/dlls/win32u/menu.c b/dlls/win32u/menu.c
index 98456446e11..43c548b6461 100644
--- a/dlls/win32u/menu.c
+++ b/dlls/win32u/menu.c
@@ -1375,6 +1375,9 @@ BOOL WINAPI NtUserRemoveMenu( HMENU handle, UINT id, UINT flags )
     {
         struct menu_item *new_items, *item = &menu->items[pos];

+        if (menu->FocusedItem != NO_SELECTED_ITEM)
+            menu->items[menu->FocusedItem].fState &= ~(MF_HILITE | MF_MOUSESELECT);
+
         while (pos < menu->nItems)
         {
             *item = item[1];
@@ -1385,6 +1388,8 @@ BOOL WINAPI NtUserRemoveMenu( HMENU handle, UINT id, UINT flags )
         if (new_items) menu->items = new_items;
     }

+    menu->FocusedItem = NO_SELECTED_ITEM;
+
     release_menu_ptr(menu);
     return TRUE;
 }