[vlc-devel] commit: Ignore X11 errors on Maemo ( Rémi Denis-Courmont )

[git version control]

vlc | branch: master | Rémi Denis-Courmont <rem at videolan.org> | Sat May 17 15:12:33 2008 +0300| [602005bd955b33eb95b241a9b4a4e2a92c55b389]

Ignore X11 errors on Maemo

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=602005bd955b33eb95b241a9b4a4e2a92c55b389
---

 modules/video_output/x11/xcommon.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/modules/video_output/x11/xcommon.c b/modules/video_output/x11/xcommon.c
index 10acaa1..3560352 100644
--- a/modules/video_output/x11/xcommon.c
+++ b/modules/video_output/x11/xcommon.c
@@ -3009,8 +3009,13 @@ static int X11ErrorHandler( Display * display, XErrorEvent * event )
         return i_shm_major = 0;
 #endif
 
+#ifndef HAVE_OSSO
     XSetErrorHandler(NULL);
     return (XSetErrorHandler(X11ErrorHandler))( display, event );
+#else
+    /* Work-around Maemo Xvideo bug */
+    return 0;
+#endif
 }
 
 #ifdef MODULE_NAME_IS_x11