summaryrefslogtreecommitdiffstats
path: root/macosx
diff options
context:
space:
mode:
authordas <das>2008-12-07 16:44:58 (GMT)
committerdas <das>2008-12-07 16:44:58 (GMT)
commitff814e408b2c33d29eb37c181e2b3ac1c827212b (patch)
treec0b8580fbc728861e9f68a833ea1d3feff0465d9 /macosx
parent816e6afe5aa1f2d7ab7a23576041e8fcdd704eea (diff)
downloadtk-ff814e408b2c33d29eb37c181e2b3ac1c827212b.zip
tk-ff814e408b2c33d29eb37c181e2b3ac1c827212b.tar.gz
tk-ff814e408b2c33d29eb37c181e2b3ac1c827212b.tar.bz2
MenuDefProc: avoid crash with non-Tk menus
Diffstat (limited to 'macosx')
-rw-r--r--macosx/tkMacOSXMenu.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/macosx/tkMacOSXMenu.c b/macosx/tkMacOSXMenu.c
index 17880c4..d658dbf 100644
--- a/macosx/tkMacOSXMenu.c
+++ b/macosx/tkMacOSXMenu.c
@@ -10,7 +10,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkMacOSXMenu.c,v 1.6.2.30 2007/11/09 06:26:56 das Exp $
+ * RCS: @(#) $Id: tkMacOSXMenu.c,v 1.6.2.31 2008/12/07 16:44:58 das Exp $
*/
#include "tkMacOSXPrivate.h"
@@ -4122,11 +4122,8 @@ MenuDefProc(
menuID = GetMenuID(menu);
commandEntryPtr = Tcl_FindHashEntry(&commandTable, (char*)(intptr_t)menuID);
- if (commandEntryPtr) {
- menuPtr = (TkMenu *) Tcl_GetHashValue(commandEntryPtr);
- } else {
- menuPtr = NULL;
- }
+ if (!commandEntryPtr) return;
+ menuPtr = (TkMenu *) Tcl_GetHashValue(commandEntryPtr);
switch (message) {
case kMenuInitMsg: