summaryrefslogtreecommitdiffstats
path: root/libvo/x11_common.c
diff options
context:
space:
mode:
authoral <al@b3059339-0415-0410-9bf9-f77b7e298cf2>2005-12-07 11:39:24 +0000
committeral <al@b3059339-0415-0410-9bf9-f77b7e298cf2>2005-12-07 11:39:24 +0000
commitd9329207ccb349d9054131fa39e2dc8675b66a80 (patch)
treeaefdc9d5b412fa32de417259446f541a9df05c4c /libvo/x11_common.c
parentd23cd76afb5b0765b2ebe0c149244c60111ffa68 (diff)
downloadmpv-d9329207ccb349d9054131fa39e2dc8675b66a80.tar.bz2
mpv-d9329207ccb349d9054131fa39e2dc8675b66a80.tar.xz
Don't abort when xscreensaver window isn't available anymore.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17124 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo/x11_common.c')
-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);
}
}