diff options
| author | fvogel <fvogelnew1@free.fr> | 2016-07-26 09:36:31 (GMT) |
|---|---|---|
| committer | fvogel <fvogelnew1@free.fr> | 2016-07-26 09:36:31 (GMT) |
| commit | 549adde50fcfb69493f670105f83cfb8dbcb8afe (patch) | |
| tree | 550cada2e21c788eefbd5f087c8f14aa5290c0ea | |
| parent | 2bf3610a3322115763baaec8457df71f229fd12e (diff) | |
| parent | 077b98131bbf66a3363e3c450447af6c9edf77cf (diff) | |
| download | tk-549adde50fcfb69493f670105f83cfb8dbcb8afe.zip tk-549adde50fcfb69493f670105f83cfb8dbcb8afe.tar.gz tk-549adde50fcfb69493f670105f83cfb8dbcb8afe.tar.bz2 | |
merged core-8-6-branch
| -rw-r--r-- | generic/tkBusy.c | 4 | ||||
| -rw-r--r-- | generic/tkWindow.c | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/generic/tkBusy.c b/generic/tkBusy.c index 65248a2..b36d453 100644 --- a/generic/tkBusy.c +++ b/generic/tkBusy.c @@ -433,6 +433,10 @@ MakeTransparentWindowExist( TkpMakeTransparentWindowExist(tkwin, parent); + if (winPtr->window == None) { + return; /* Platform didn't make Window. */ + } + dispPtr = winPtr->dispPtr; hPtr = Tcl_CreateHashEntry(&dispPtr->winTable, (char *) winPtr->window, ¬Used); diff --git a/generic/tkWindow.c b/generic/tkWindow.c index 7afb031..0c60321 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) { |