Skip to content

V
vlc-1.1
Commit 602005bd authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

Ignore X11 errors on Maemo

parent a66a2bc5
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 0 deletions
modules/video_output/x11/xcommon.c
View file @ 602005bd
...@@ -3009,8 +3009,13 @@ static int X11ErrorHandler( Display * display, XErrorEvent * event ) ...@@ -3009,8 +3009,13 @@ static int X11ErrorHandler( Display * display, XErrorEvent * event )
return i_shm_major = 0; return i_shm_major = 0;
#endif #endif
#ifndef HAVE_OSSO
XSetErrorHandler(NULL); XSetErrorHandler(NULL);
return (XSetErrorHandler(X11ErrorHandler))( display, event ); return (XSetErrorHandler(X11ErrorHandler))( display, event );
#else
/* Work-around Maemo Xvideo bug */
return 0;
#endif
} }
#ifdef MODULE_NAME_IS_x11 #ifdef MODULE_NAME_IS_x11
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment