Attachment "menuinit.patch" to
ticket [749908ff]
added by
hobbs
2005-10-11 03:27:37.
Index: generic/tkMenu.c
===================================================================
RCS file: /cvsroot/tktoolkit/tk/generic/tkMenu.c,v
retrieving revision 1.28
diff -u -r1.28 tkMenu.c
--- generic/tkMenu.c 10 Oct 2005 19:28:27 -0000 1.28
+++ generic/tkMenu.c 10 Oct 2005 20:23:40 -0000
@@ -3118,11 +3118,19 @@
* toplevel needs to be set to. NULL means
* that their is no menu now. */
{
+ TkWindow *winPtr = (TkWindow *)tkwin;
TkMenuTopLevelList *topLevelListPtr, *prevTopLevelPtr;
TkMenu *menuPtr;
TkMenuReferences *menuRefPtr;
- TkMenuInit();
+ /*
+ * Avoid reinitialization if we are just cleaning up dead windows.
+ * Perhaps knowing when Tcl was really exiting would be better than
+ * just checking for this winPtr being dead. [Bug 749908]
+ */
+ if (!(winPtr->flags & TK_ALREADY_DEAD)) {
+ TkMenuInit();
+ }
/*
* Destroy the menubar instances of the old menu. Take this window