summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhobbs <hobbs>1999-12-22 20:01:26 (GMT)
committerhobbs <hobbs>1999-12-22 20:01:26 (GMT)
commit0251da8e4fe2b9bdea4900be99fad2b2a7298d5b (patch)
treec091140cbce20d64ada303d14468b3ee03f96bae
parent0f9c537dbbab730afd704466000cf6dbd7b91638 (diff)
downloadtk-0251da8e4fe2b9bdea4900be99fad2b2a7298d5b.zip
tk-0251da8e4fe2b9bdea4900be99fad2b2a7298d5b.tar.gz
tk-0251da8e4fe2b9bdea4900be99fad2b2a7298d5b.tar.bz2
* unix/tkUnixScale.c: fixed potential segv from patch in 3897
-rw-r--r--unix/tkUnixScale.c5
1 files 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;
}