summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfvogel <fvogelnew1@free.fr>2016-05-30 19:38:04 (GMT)
committerfvogel <fvogelnew1@free.fr>2016-05-30 19:38:04 (GMT)
commit3c97457911a615a201c7105b290b206ac22e9d2f (patch)
tree0c0662ab12f835615d67d1328bfdad1304716450
parentef21094dd7164fbf1d96d8c33570f4803b7e35e6 (diff)
downloadtk-3c97457911a615a201c7105b290b206ac22e9d2f.zip
tk-3c97457911a615a201c7105b290b206ac22e9d2f.tar.gz
tk-3c97457911a615a201c7105b290b206ac22e9d2f.tar.bz2
Fixed crash when calling event generate {} <Motion> -warp 1
-rw-r--r--generic/tkBind.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/generic/tkBind.c b/generic/tkBind.c
index 4374494..3b05066 100644
--- a/generic/tkBind.c
+++ b/generic/tkBind.c
@@ -3539,10 +3539,13 @@ DoWarp(
* 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 (Tk_IsMapped(dispPtr->warpWindow)
- && (Tk_WindowId(dispPtr->warpWindow) != None)) {
+ if ((dispPtr->warpWindow == NULL) ||
+ (Tk_IsMapped(dispPtr->warpWindow)
+ && (Tk_WindowId(dispPtr->warpWindow) != None))) {
TkpWarpPointer(dispPtr);
XForceScreenSaver(dispPtr->display, ScreenSaverReset);
}