projects
/
reactos.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8c1b044
)
[NtUser]
author
James Tabor
<james.tabor@reactos.org>
Sat, 31 Jan 2015 21:44:26 +0000
(21:44 +0000)
committer
James Tabor
<james.tabor@reactos.org>
Sat, 31 Jan 2015 21:44:26 +0000
(21:44 +0000)
- Hack fix crash while removing menus. See CORE-9107 for crash information and CORE-8299 for overall menu issues.
svn path=/trunk/; revision=66132
reactos/win32ss/user/ntuser/menu.c
patch
|
blob
|
history
diff --git
a/reactos/win32ss/user/ntuser/menu.c
b/reactos/win32ss/user/ntuser/menu.c
index
89169ab
..
9c36bdc
100644
(file)
--- a/
reactos/win32ss/user/ntuser/menu.c
+++ b/
reactos/win32ss/user/ntuser/menu.c
@@
-252,6
+252,11
@@
IntDestroyMenuObject(PMENU Menu, BOOL bRecurse)
}
}
}
+ if (UserObjectInDestroy(Menu->head.h))
+ {
+ ERR("Menu already dead!\n");
+ return FALSE;
+ }
ret = UserDeleteObject(Menu->head.h, TYPE_MENU);
if (!ret)
{ // Make sure it is really dead or just marked for deletion.