From f929ca68c6e3167711956ae3171d9f01478feae4 Mon Sep 17 00:00:00 2001 From: hobbs Date: Wed, 22 Dec 1999 20:01:25 +0000 Subject: * unix/tkUnixScale.c: fixed potential segv from patch in 3897 FossilOrigin-Name: e0d3dad53b7a4fd163c0aac0de6ca2de0304911a --- unix/tkUnixScale.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/unix/tkUnixScale.c b/unix/tkUnixScale.c index 5d7e9a1..bafb887 100644 --- a/unix/tkUnixScale.c +++ b/unix/tkUnixScale.c @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkUnixScale.c,v 1.3 1999/04/16 01:51:47 stanton Exp $ + * RCS: @(#) $Id: tkUnixScale.c,v 1.4 1999/12/22 20:01:26 hobbs Exp $ */ #include "tkScale.h" @@ -504,6 +504,7 @@ TkpDisplayScale(clientData) char string[PRINT_CHARS]; XRectangle drawnArea; + scalePtr->flags &= ~REDRAW_PENDING; if ((scalePtr->tkwin == NULL) || !Tk_IsMapped(scalePtr->tkwin)) { goto done; } @@ -527,7 +528,7 @@ TkpDisplayScale(clientData) } Tcl_Release((ClientData) interp); scalePtr->flags &= ~INVOKE_COMMAND; - if (scalePtr->tkwin == NULL) { + if (scalePtr->flags & SCALE_DELETED) { Tcl_Release((ClientData) scalePtr); return; } -- cgit v0.12