diff options
| author | dgp <dgp@noemail.net> | 2016-07-21 20:08:50 (GMT) |
|---|---|---|
| committer | dgp <dgp@noemail.net> | 2016-07-21 20:08:50 (GMT) |
| commit | b6f0d90648eba7b6aa9c3b6b74d0e175f00ba16b (patch) | |
| tree | cd7aaee28e7876e8bfdd77e835c534b13cbe5f98 | |
| parent | 6ddcf9ad5374d63e332d9cf75792b0eb445efd5e (diff) | |
| parent | 6e21967c0573ca7a2744d318dc3ee0222875e273 (diff) | |
| download | tk-b6f0d90648eba7b6aa9c3b6b74d0e175f00ba16b.zip tk-b6f0d90648eba7b6aa9c3b6b74d0e175f00ba16b.tar.gz tk-b6f0d90648eba7b6aa9c3b6b74d0e175f00ba16b.tar.bz2 | |
[450bb0ecad] Fix corruption [tk busy] creates on OSX.
FossilOrigin-Name: d3a347d2af510a762915f4c9abe97ca1f17869e1
| -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) { |