summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--libvo/x11_common.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libvo/x11_common.c b/libvo/x11_common.c
index ed84a69c40..44ca9216b6 100644
--- a/libvo/x11_common.c
+++ b/libvo/x11_common.c
@@ -1586,8 +1586,10 @@ void xscreensaver_heartbeat(void)
ev.xclient.data.l[0] = (long) deactivate;
mp_msg(MSGT_VO, MSGL_DBG2, "Pinging xscreensaver.\n");
+ old_handler = XSetErrorHandler(badwindow_handler);
XSendEvent(mDisplay, xs_windowid, False, 0L, &ev);
XSync(mDisplay, False);
+ XSetErrorHandler(old_handler);
}
}