Mercurial > mplayer.hg

changeset 17123:f79b39b07cc3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Don't abort when xscreensaver window isn't available anymore.
author al
date Wed, 07 Dec 2005 11:39:24 +0000
parents c23ca41ad996
children 0d61c9da6612
files libvo/x11_common.c
diffstat 1 files changed, 2 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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);        
     }
 }