From be1c6137ba043ec6b925ce0808708027ea720b76 Mon Sep 17 00:00:00 2001
From: das <das>
Date: Sun, 7 Dec 2008 16:44:58 +0000
Subject: MenuDefProc: avoid crash with non-Tk menus

---
 macosx/tkMacOSXMenu.c | 9 +++------
 1 file 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:
-- 
cgit v0.12