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

---
 macosx/tkMacOSXMenu.c | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/macosx/tkMacOSXMenu.c b/macosx/tkMacOSXMenu.c
index fbaa033..366b222 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.46 2008/10/27 11:55:44 dkf Exp $
+ * RCS: @(#) $Id: tkMacOSXMenu.c,v 1.47 2008/12/07 16:30:09 das Exp $
  */
 
 #include "tkMacOSXPrivate.h"
@@ -4121,12 +4121,8 @@ MenuDefProc(
 
     menuID = GetMenuID(menu);
     commandEntryPtr = Tcl_FindHashEntry(&commandTable, (char*)(intptr_t)menuID);
-
-    if (commandEntryPtr) {
-	menuPtr = Tcl_GetHashValue(commandEntryPtr);
-    } else {
-	menuPtr = NULL;
-    }
+    if (!commandEntryPtr) return;
+    menuPtr = Tcl_GetHashValue(commandEntryPtr);
 
     switch (message) {
     case kMenuInitMsg:
-- 
cgit v0.12