summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2021-06-04 14:47:44 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2021-06-04 14:47:44 (GMT)
commit72a980f72faa8a7136dc3d695877e7e42840bd16 (patch)
tree57570a140031e5ffdd2cf9633e9ea755110fc147
parent03f9d27042389b6edb846a769b312f7b596c80a8 (diff)
downloadtk-72a980f72faa8a7136dc3d695877e7e42840bd16.zip
tk-72a980f72faa8a7136dc3d695877e7e42840bd16.tar.gz
tk-72a980f72faa8a7136dc3d695877e7e42840bd16.tar.bz2
Analogous changes for linux and Windows
-rw-r--r--unix/tkUnixEmbed.c1
-rw-r--r--win/tkWinEmbed.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/unix/tkUnixEmbed.c b/unix/tkUnixEmbed.c
index a33a623..ff7860b 100644
--- a/unix/tkUnixEmbed.c
+++ b/unix/tkUnixEmbed.c
@@ -979,6 +979,7 @@ EmbedWindowDeleted(
prevPtr = NULL;
containerPtr = tsdPtr->firstContainerPtr;
while (1) {
+ if (containerPtr == NULL) return;
if (containerPtr->embeddedPtr == winPtr) {
containerPtr->wrapper = None;
containerPtr->embeddedPtr = NULL;
diff --git a/win/tkWinEmbed.c b/win/tkWinEmbed.c
index 1c6ba6c..36c6047 100644
--- a/win/tkWinEmbed.c
+++ b/win/tkWinEmbed.c
@@ -1088,8 +1088,8 @@ EmbedWindowDeleted(
prevPtr = NULL;
containerPtr = tsdPtr->firstContainerPtr;
- if (containerPtr == NULL) return;
while (1) {
+ if (containerPtr == NULL) return;
if (containerPtr->embeddedPtr == winPtr) {
containerPtr->embeddedHWnd = NULL;
containerPtr->embeddedPtr = NULL;