[vlc-commits] xosd: call vlc_xlib_init first

Alexis Ballier git at videolan.org
Fri Dec 9 16:16:26 CET 2011


vlc/vlc-1.2 | branch: master | Alexis Ballier <aballier at gentoo.org> | Thu Dec  8 19:37:15 2011 -0300| [b00399aa9e33cf145119ed2855c4a121a56b8f95] | committer: Rémi Denis-Courmont

xosd: call vlc_xlib_init first

See: https://bugs.gentoo.org/show_bug.cgi?id=393439

Signed-off-by: Rémi Denis-Courmont <remi at remlab.net>
(cherry picked from commit 9b40c48c8aa69e71abb0263b1814ede7a370f7c9)

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

 modules/notify/xosd.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/modules/notify/xosd.c b/modules/notify/xosd.c
index a87d7ae..df47323 100644
--- a/modules/notify/xosd.c
+++ b/modules/notify/xosd.c
@@ -34,6 +34,7 @@
 #include <vlc_playlist.h>
 #include <vlc_input.h>
 #include <vlc_interface.h>
+#include <vlc_xlib.h>
 
 #include <xosd.h>
 
@@ -109,6 +110,9 @@ static int Open( vlc_object_t *p_this )
     xosd *p_osd;
     char *psz_font, *psz_colour;
 
+    if (!vlc_xlib_init(p_this))
+        return VLC_EGENERIC;
+
     if( getenv( "DISPLAY" ) == NULL )
     {
         msg_Err( p_intf, "no display, please set the DISPLAY variable" );



More information about the vlc-commits mailing list