summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authorhobbs <hobbs>2002-10-02 20:59:26 (GMT)
committerhobbs <hobbs>2002-10-02 20:59:26 (GMT)
commit35ee67d3da1d3d2bc5b463e16837451550387d1c (patch)
tree8217af7d57954b413033a928a2ac4d64c9a7c6e7 /generic
parentdb14d3e554404d079d9ac125594e876a6fb0aa88 (diff)
downloadtk-35ee67d3da1d3d2bc5b463e16837451550387d1c.zip
tk-35ee67d3da1d3d2bc5b463e16837451550387d1c.tar.gz
tk-35ee67d3da1d3d2bc5b463e16837451550387d1c.tar.bz2
* tests/entry.test: added entry-20.7
* generic/tkEntry.c (EntryTextVarProc): check if the entry if being deleted before handling an associated textvariable. [Bug #607390 #617446]
Diffstat (limited to 'generic')
-rw-r--r--generic/tkEntry.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/generic/tkEntry.c b/generic/tkEntry.c
index 53e0d60..51c459c 100644
--- a/generic/tkEntry.c
+++ b/generic/tkEntry.c
@@ -14,7 +14,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkEntry.c,v 1.31 2002/08/05 04:30:38 dgp Exp $
+ * RCS: @(#) $Id: tkEntry.c,v 1.32 2002/10/02 20:59:26 hobbs Exp $
*/
#include "tkInt.h"
@@ -3295,6 +3295,13 @@ EntryTextVarProc(clientData, interp, name1, name2, flags)
Entry *entryPtr = (Entry *) clientData;
CONST char *value;
+ if (entryPtr->flags & ENTRY_DELETED) {
+ /*
+ * Just abort early if we entered here while being deleted.
+ */
+ return (char *) NULL;
+ }
+
/*
* If the variable is unset, then immediately recreate it unless
* the whole interpreter is going away.