diff options
| -rw-r--r-- | generic/tkBind.c | 13 | ||||
| -rw-r--r-- | tests/bind.test | 12 |
2 files changed, 23 insertions, 2 deletions
diff --git a/generic/tkBind.c b/generic/tkBind.c index 9cd3b7b..4374494 100644 --- a/generic/tkBind.c +++ b/generic/tkBind.c @@ -3535,8 +3535,17 @@ DoWarp( { TkDisplay *dispPtr = clientData; - TkpWarpPointer(dispPtr); - XForceScreenSaver(dispPtr->display, ScreenSaverReset); + /* + * DoWarp was scheduled only if the window was mapped. It needs to be + * still mapped at the time the present idle callback is executed. Also + * one needs to guard against window destruction in the meantime. + */ + + if (Tk_IsMapped(dispPtr->warpWindow) + && (Tk_WindowId(dispPtr->warpWindow) != None)) { + TkpWarpPointer(dispPtr); + XForceScreenSaver(dispPtr->display, ScreenSaverReset); + } dispPtr->flags &= ~TK_DISPLAY_IN_WARP; } diff --git a/tests/bind.test b/tests/bind.test index ab3fa15..ff1b4f9 100644 --- a/tests/bind.test +++ b/tests/bind.test @@ -6101,6 +6101,18 @@ test bind-31.7 {virtual event user_data field - unshared, asynch} -setup { destroy .t.f } -result {{} {} {TestUserData >b<}} +test bind-32 {-warp, window was destroyed before the idle callback DoWarp} -setup { + frame .t.f + pack .t.f + focus -force .t.f + update +} -body { + event generate .t.f <Button-1> -warp 1 + destroy .t.f + update ; # shall simply not crash +} -cleanup { +} -result {} + # cleanup cleanupTests |