* unlink menu object from window object on destroy

svn path=/trunk/; revision=23128
This commit is contained in:
Johannes Anderwald 2006-07-17 19:16:30 +00:00
parent 7ddd4aa708
commit de3f42794a

View file

@ -277,6 +277,7 @@ IntDestroyMenuObject(PMENU_OBJECT Menu,
{ {
if(Menu) if(Menu)
{ {
PWINDOW_OBJECT Window;
PWINSTATION_OBJECT WindowStation; PWINSTATION_OBJECT WindowStation;
NTSTATUS Status; NTSTATUS Status;
@ -296,6 +297,15 @@ IntDestroyMenuObject(PMENU_OBJECT Menu,
NULL); NULL);
if(NT_SUCCESS(Status)) if(NT_SUCCESS(Status))
{ {
if (Menu->MenuInfo.Wnd)
{
Window = UserGetWindowObject(Menu->MenuInfo.Wnd);
if (Window)
{
Window->IDMenu = 0;;
}
}
ObmDeleteObject(Menu->MenuInfo.Self, otMenu); ObmDeleteObject(Menu->MenuInfo.Self, otMenu);
ObDereferenceObject(WindowStation); ObDereferenceObject(WindowStation);
return TRUE; return TRUE;