[MPlayer-cvslog] CVS: main/libvo x11_common.c,1.201,1.202

[Alexander Strasser beastd]

CVS change done by Alexander Strasser (beastd)

Update of /cvsroot/mplayer/main/libvo
In directory mail:/var2/tmp/cvs-serv6473/libvo

Modified Files:
	x11_common.c 
Log Message:
Don't abort when xscreensaver window isn't available anymore.


Index: x11_common.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/x11_common.c,v
retrieving revision 1.201
retrieving revision 1.202
diff -u -r1.201 -r1.202
--- x11_common.c	22 Nov 2005 22:05:47 -0000	1.201
+++ x11_common.c	7 Dec 2005 11:39:24 -0000	1.202
@@ -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);        
     }
 }