diff options
| author | fvogel <fvogelnew1@free.fr> | 2016-08-29 15:28:20 (GMT) |
|---|---|---|
| committer | fvogel <fvogelnew1@free.fr> | 2016-08-29 15:28:20 (GMT) |
| commit | 992eb3df2d03dec6291784e8dca7e6d85b279c7a (patch) | |
| tree | c885db53fd7bd38e3971e2b93242b2e798961ee9 /generic/tkWindow.c | |
| parent | 1052e56fe96f3ece407a6374714af0302c9a5e3c (diff) | |
| parent | 76052445ac39afd2c455431d80335dd464ed755e (diff) | |
| download | tk-992eb3df2d03dec6291784e8dca7e6d85b279c7a.zip tk-992eb3df2d03dec6291784e8dca7e6d85b279c7a.tar.gz tk-992eb3df2d03dec6291784e8dca7e6d85b279c7a.tar.bz2 | |
Rebased to trunk since TIP #449 was accepted for merging to trunk only, not to core-8-6-branchtip_449
Diffstat (limited to 'generic/tkWindow.c')
| -rw-r--r-- | generic/tkWindow.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/generic/tkWindow.c b/generic/tkWindow.c index 7afb031..5855b7c 100644 --- a/generic/tkWindow.c +++ b/generic/tkWindow.c @@ -2351,6 +2351,9 @@ Tk_IdToWindow( break; } } + if (window == None) { + return NULL; + } hPtr = Tcl_FindHashEntry(&dispPtr->winTable, (char *) window); if (hPtr == NULL) { @@ -3098,7 +3101,7 @@ Initialize( Tcl_ListObjAppendElement(NULL, cmd, Tcl_NewStringObj("::safe::TkInit", -1)); Tcl_ListObjAppendElement(NULL, cmd, Tcl_GetObjResult(master)); - + /* * Step 2 : Eval in the master. The argument is the *reversed* interp * path of the slave. |