summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authorfvogel <fvogelnew1@free.fr>2015-09-29 19:30:02 (GMT)
committerfvogel <fvogelnew1@free.fr>2015-09-29 19:30:02 (GMT)
commit9c35ad5d2bea5b5ae634bc96bedc74867dc4c9cc (patch)
tree910ef88c566c1299a1f551bb25800423467b6352 /generic
parente2138596ed17444e34d4aacc028486e200cad81f (diff)
parent8fd84f53e70e83dd996314447bb0da5ec8cd5468 (diff)
downloadtk-9c35ad5d2bea5b5ae634bc96bedc74867dc4c9cc.zip
tk-9c35ad5d2bea5b5ae634bc96bedc74867dc4c9cc.tar.gz
tk-9c35ad5d2bea5b5ae634bc96bedc74867dc4c9cc.tar.bz2
Fixed bug [1501749fff] - Crash on embedded window deletion bound to <Map> event
Diffstat (limited to 'generic')
-rw-r--r--generic/tkTextWind.c16
1 files changed, 10 insertions, 6 deletions
diff --git a/generic/tkTextWind.c b/generic/tkTextWind.c
index bd61d75..c9fc20f 100644
--- a/generic/tkTextWind.c
+++ b/generic/tkTextWind.c
@@ -1134,6 +1134,16 @@ TkTextEmbWinDisplayProc(
&lineX, &windowY, &width, &height);
windowX = lineX - chunkPtr->x + x;
+ /*
+ * Mark the window as displayed so that it won't get unmapped.
+ * This needs to be done before the next instruction block because
+ * Tk_MaintainGeometry/Tk_MapWindow will run event handlers, in
+ * particular for the <Map> event, and if the bound script deletes
+ * the embedded window its clients will get freed.
+ */
+
+ client->displayed = 1;
+
if (textPtr->tkwin == Tk_Parent(tkwin)) {
if ((windowX != Tk_X(tkwin)) || (windowY != Tk_Y(tkwin))
|| (Tk_ReqWidth(tkwin) != Tk_Width(tkwin))
@@ -1145,12 +1155,6 @@ TkTextEmbWinDisplayProc(
Tk_MaintainGeometry(tkwin, textPtr->tkwin, windowX, windowY,
width, height);
}
-
- /*
- * Mark the window as displayed so that it won't get unmapped.
- */
-
- client->displayed = 1;
}
/*