summaryrefslogtreecommitdiffstats
path: root/macosx
diff options
context:
space:
mode:
authorculler <culler>2021-06-04 18:43:11 (GMT)
committerculler <culler>2021-06-04 18:43:11 (GMT)
commit41ca6c313f36f326d5b35a9b9f8da2ba0e52c3b2 (patch)
treef609dcdf09e910a6f290b3c7228ee92df3b7c28f /macosx
parent5f861f720d5b44be33c202a749e5eabeab364a4d (diff)
parent6380f833c39317057defb9d41f32707be9ff9ef4 (diff)
downloadtk-41ca6c313f36f326d5b35a9b9f8da2ba0e52c3b2.zip
tk-41ca6c313f36f326d5b35a9b9f8da2ba0e52c3b2.tar.gz
tk-41ca6c313f36f326d5b35a9b9f8da2ba0e52c3b2.tar.bz2
Merge 8.6
Diffstat (limited to 'macosx')
-rw-r--r--macosx/tkMacOSXEmbed.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/macosx/tkMacOSXEmbed.c b/macosx/tkMacOSXEmbed.c
index 832f404..029624d 100644
--- a/macosx/tkMacOSXEmbed.c
+++ b/macosx/tkMacOSXEmbed.c
@@ -1082,6 +1082,9 @@ EmbedWindowDeleted(
prevPtr = NULL;
containerPtr = firstContainerPtr;
while (1) {
+ if (containerPtr == NULL) {
+ return;
+ }
if (containerPtr->embeddedPtr == winPtr) {
/*
* We also have to destroy our parent, to clean up the container.