Ignore X11 errors on Maemo

602005bd · Rémi Denis-Courmont · a66a2bc5 · 602005bd
Commit 602005bd authored May 17, 2008 by Rémi Denis-Courmont
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 0 deletions

modules/video_output/x11/xcommon.c modules/video_output/x11/xcommon.c +5 -0

No files found.
--- 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