From 682d30ed7f59d3c732d08cf6ccc715e738784453 Mon Sep 17 00:00:00 2001 From: dgp Date: Wed, 2 Mar 2016 02:41:54 +0000 Subject: [450bb0ecad] Proposed fix for [tk busy] corruption in Aqua Tk. --- generic/tkBusy.c | 4 ++++ generic/tkWindow.c | 3 +++ 2 files changed, 7 insertions(+) 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) { -- cgit v0.12