diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | generic/tkImage.c | 6 |
2 files changed, 8 insertions, 4 deletions
@@ -1,3 +1,9 @@ +2003-01-19 Jeff Hobbs <jeffh@ActiveState.com> + + * generic/tkImage.c (DeleteImage): delete the image's entry in the + image table correctly when there are no more instances. This + reopens bug 220891. [Bug #669759] + 2003-01-18 Jeff Hobbs <jeffh@ActiveState.com> * doc/loadTk.n: note that ::safe::loadTk has a prereq on diff --git a/generic/tkImage.c b/generic/tkImage.c index 548be74..3312aef 100644 --- a/generic/tkImage.c +++ b/generic/tkImage.c @@ -11,7 +11,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkImage.c,v 1.17 2002/08/05 04:30:39 dgp Exp $ + * RCS: @(#) $Id: tkImage.c,v 1.18 2003/01/19 09:50:01 hobbs Exp $ */ #include "tkInt.h" @@ -908,9 +908,7 @@ DeleteImage(masterPtr) (*typePtr->deleteProc)(masterPtr->masterData); } if (masterPtr->instancePtr == NULL) { - if ((masterPtr->winPtr->flags & TK_ALREADY_DEAD) == 0) { - Tcl_DeleteHashEntry(masterPtr->hPtr); - } + Tcl_DeleteHashEntry(masterPtr->hPtr); Tcl_Release((ClientData) masterPtr->winPtr); ckfree((char *) masterPtr); } |