diff options
| author | dgp <dgp@users.sourceforge.net> | 2016-03-02 02:41:54 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2016-03-02 02:41:54 (GMT) |
| commit | 682d30ed7f59d3c732d08cf6ccc715e738784453 (patch) | |
| tree | b6b41d27bf8eb02b710ed64c5cb095cee430f8bc /generic | |
| parent | 2cabee819956e5a5b0293e228faa026d217a621a (diff) | |
| download | tk-682d30ed7f59d3c732d08cf6ccc715e738784453.zip tk-682d30ed7f59d3c732d08cf6ccc715e738784453.tar.gz tk-682d30ed7f59d3c732d08cf6ccc715e738784453.tar.bz2 | |
[450bb0ecad] Proposed fix for [tk busy] corruption in Aqua Tk.
Diffstat (limited to 'generic')
| -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 b5cbbab..1e88844 100644 --- a/generic/tkWindow.c +++ b/generic/tkWindow.c @@ -2391,6 +2391,9 @@ Tk_IdToWindow( break; } } + if (window == None) { + return NULL; + } hPtr = Tcl_FindHashEntry(&dispPtr->winTable, (char *) window); if (hPtr == NULL) { |