diff options
| author | fvogel <fvogel@noemail.net> | 2016-07-26 09:36:31 (GMT) |
|---|---|---|
| committer | fvogel <fvogel@noemail.net> | 2016-07-26 09:36:31 (GMT) |
| commit | 379a8f1ce3d291654e65991020a62b72f5eff121 (patch) | |
| tree | 550cada2e21c788eefbd5f087c8f14aa5290c0ea | |
| parent | 401cf52a33ffbdbb2fc7db6c4868dd898dbc7694 (diff) | |
| parent | b6f0d90648eba7b6aa9c3b6b74d0e175f00ba16b (diff) | |
| download | tk-379a8f1ce3d291654e65991020a62b72f5eff121.zip tk-379a8f1ce3d291654e65991020a62b72f5eff121.tar.gz tk-379a8f1ce3d291654e65991020a62b72f5eff121.tar.bz2 | |
merged core-8-6-branch
FossilOrigin-Name: 962d6e22fb05087df452277eea51b3a638cd7e51
| -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) { |