From d9329207ccb349d9054131fa39e2dc8675b66a80 Mon Sep 17 00:00:00 2001
From: al <al@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Wed, 7 Dec 2005 11:39:24 +0000
Subject: 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
---
 libvo/x11_common.c | 2 ++
 1 file changed, 2 insertions(+)

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);        
     }
 }
 
-- 
cgit v1.2.3