1 files changed, 14 insertions, 2 deletions
diff --git a/generic/tkBind.c b/generic/tkBind.c
index 9cd3b7b..3b05066 100644
--- a/generic/tkBind.c
+++ b/generic/tkBind.c
@@ -3535,8 +3535,20 @@ 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.
+     * Finally, the case warpWindow == NULL is special in that it means
+     * the whole screen.
+     */
+
+    if ((dispPtr->warpWindow == NULL) ||
+            (Tk_IsMapped(dispPtr->warpWindow)
+            && (Tk_WindowId(dispPtr->warpWindow) != None))) {
+        TkpWarpPointer(dispPtr);
+        XForceScreenSaver(dispPtr->display, ScreenSaverReset);
+    }
     dispPtr->flags &= ~TK_DISPLAY_IN_WARP;
 }