summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhobbs <hobbs>2000-02-26 03:11:07 (GMT)
committerhobbs <hobbs>2000-02-26 03:11:07 (GMT)
commit9ddd72d5fb7e050ceacbb03b2b3ab4a6bc01d40e (patch)
treebfaae585f37dcf3702eed0899443dd2db15ceea7
parent82800e44acbe9cb1a97b87ca1a503360ee3db8c2 (diff)
downloadtk-9ddd72d5fb7e050ceacbb03b2b3ab4a6bc01d40e.zip
tk-9ddd72d5fb7e050ceacbb03b2b3ab4a6bc01d40e.tar.gz
tk-9ddd72d5fb7e050ceacbb03b2b3ab4a6bc01d40e.tar.bz2
* win/tkWinWm.c (RaiseWinWhenIdle): Checked for the possibility
that the window could be destroyed (can occur with wm deiconify .toplevel; destroy .toplevel).
-rw-r--r--win/tkWinWm.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/win/tkWinWm.c b/win/tkWinWm.c
index e9a117a..2b1da14 100644
--- a/win/tkWinWm.c
+++ b/win/tkWinWm.c
@@ -12,7 +12,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkWinWm.c,v 1.20 2000/02/01 11:41:44 hobbs Exp $
+ * RCS: @(#) $Id: tkWinWm.c,v 1.21 2000/02/26 03:11:07 hobbs Exp $
*/
#include "tkWinInt.h"
@@ -4550,6 +4550,9 @@ RaiseWinWhenIdle(clientData)
{
register TkWindow *winPtr = (TkWindow *) clientData;
+ if ((winPtr == NULL) || (winPtr->flags & TK_ALREADY_DEAD)) {
+ return;
+ }
if (winPtr->wmInfoPtr->flags & WM_UPDATE_PENDING) {
Tcl_CancelIdleCall(UpdateGeometryInfo, (ClientData) winPtr);
UpdateGeometryInfo((ClientData) winPtr);