diff options
| author | culler <culler> | 2017-11-24 23:27:10 (GMT) |
|---|---|---|
| committer | culler <culler> | 2017-11-24 23:27:10 (GMT) |
| commit | b3b49a0076376394282c87005ae71ea8bfda6b78 (patch) | |
| tree | ef3de10603d47c74f67faf6e81882a6b8622fc28 | |
| parent | 2e89b1cbfa3c417a84208ac3449bc403b9bd4e01 (diff) | |
| parent | 2c19669804700430a0e382aa33af1d0c6ed7c7f6 (diff) | |
| download | tk-b3b49a0076376394282c87005ae71ea8bfda6b78.zip tk-b3b49a0076376394282c87005ae71ea8bfda6b78.tar.gz tk-b3b49a0076376394282c87005ae71ea8bfda6b78.tar.bz2 | |
Merge bug-c89bd0aa2c into core-8-6-branch.
| -rw-r--r-- | macosx/tkMacOSXEmbed.c | 4 | ||||
| -rw-r--r-- | macosx/tkMacOSXWm.c | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/macosx/tkMacOSXEmbed.c b/macosx/tkMacOSXEmbed.c index 99f7584..0c2ca69 100644 --- a/macosx/tkMacOSXEmbed.c +++ b/macosx/tkMacOSXEmbed.c @@ -799,6 +799,10 @@ ContainerEventProc( Container *containerPtr; Tk_ErrorHandler errHandler; + if (!firstContainerPtr) { + TKLog(@"Embedded window has nil container."); + return; + } /* * Ignore any X protocol errors that happen in this procedure (almost any * operation could fail, for example, if the embedded application has diff --git a/macosx/tkMacOSXWm.c b/macosx/tkMacOSXWm.c index 4cd6efb..832cf2f 100644 --- a/macosx/tkMacOSXWm.c +++ b/macosx/tkMacOSXWm.c @@ -933,7 +933,9 @@ TkWmDeadWindow( * Process all events immediately to force the closed window * to be deallocated. */ - while (Tk_DoOneEvent(TK_ALL_EVENTS|TK_DONT_WAIT)) {} + if (winPtr->parentPtr) { + while (Tk_DoOneEvent(TK_WINDOW_EVENTS|TK_DONT_WAIT)) {} + } [NSApp _resetAutoreleasePool]; #if DEBUG_ZOMBIES > 0 |