]> git.sesse.net Git - vlc/commitdiff
ml: don't crash if there's no sql provider
authorFrancois Cartegnie <fcvlcdev@free.fr>
Fri, 10 Aug 2012 10:33:59 +0000 (12:33 +0200)
committerFrancois Cartegnie <fcvlcdev@free.fr>
Fri, 10 Aug 2012 10:34:11 +0000 (12:34 +0200)
modules/media_library/sql_media_library.c

index 5d76181418c4fce522a4f07bd5d07e91d2b92a22..7828f8676dc6cd10f844714ade2d9e4039778f04 100644 (file)
@@ -157,7 +157,12 @@ static int load( vlc_object_t *obj )
     vlc_mutex_init( &p_ml->p_sys->lock );
 
     /* Initialise Sql module */
-    InitDatabase( p_ml );
+    if ( InitDatabase( p_ml ) != VLC_SUCCESS )
+    {
+        vlc_mutex_destroy( &p_ml->p_sys->lock );
+        //free( p_ml->p_sys ); // FIXME: Freed in InitDatase ?!?
+        return VLC_EGENERIC;
+    }
 
     /* Initialise the media pool */
     ARRAY_INIT( p_ml->p_sys->mediapool );