# HG changeset patch # User al # Date 1133955564 0 # Node ID f79b39b07cc3a3cb78fd81fb6a38f179dde9edc1 # Parent c23ca41ad9965dec3a7cf0b85587704851b6402d Don't abort when xscreensaver window isn't available anymore. diff -r c23ca41ad996 -r f79b39b07cc3 libvo/x11_common.c --- a/libvo/x11_common.c Wed Dec 07 10:07:27 2005 +0000 +++ b/libvo/x11_common.c Wed Dec 07 11:39:24 2005 +0000 @@ -1586,8 +1586,10 @@ 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); } }