summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhobbs <hobbs>2002-06-22 09:15:51 (GMT)
committerhobbs <hobbs>2002-06-22 09:15:51 (GMT)
commit904ae0db0f3d48fa1eb3f97d75fb7f79b630ae5c (patch)
tree1ddb398f1c54024fed44d0b30c2b46ce70a3b24f
parent21f69ff57ecf2aed09471f5882b3a0c7e6878982 (diff)
downloadtk-904ae0db0f3d48fa1eb3f97d75fb7f79b630ae5c.zip
tk-904ae0db0f3d48fa1eb3f97d75fb7f79b630ae5c.tar.gz
tk-904ae0db0f3d48fa1eb3f97d75fb7f79b630ae5c.tar.bz2
* generic/tkGrid.c (GridReqProc): check that gridPtr is not NULL
(may be when embedded). [Bug #548791] (halliday)
-rw-r--r--generic/tkGrid.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/generic/tkGrid.c b/generic/tkGrid.c
index 21a8e56..9934ec6 100644
--- a/generic/tkGrid.c
+++ b/generic/tkGrid.c
@@ -8,7 +8,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkGrid.c,v 1.22 2002/06/20 21:18:32 pspjuth Exp $
+ * RCS: @(#) $Id: tkGrid.c,v 1.23 2002/06/22 09:15:51 hobbs Exp $
*/
#include "tkInt.h"
@@ -1202,7 +1202,7 @@ GridReqProc(clientData, tkwin)
register Gridder *gridPtr = (Gridder *) clientData;
gridPtr = gridPtr->masterPtr;
- if (!(gridPtr->flags & REQUESTED_RELAYOUT)) {
+ if (gridPtr && !(gridPtr->flags & REQUESTED_RELAYOUT)) {
gridPtr->flags |= REQUESTED_RELAYOUT;
Tcl_DoWhenIdle(ArrangeGrid, (ClientData) gridPtr);
}