Kill one exception

[vlc] / src / control / media_library.c

diff --git a/src/control/media_library.c b/src/control/media_library.c
index 041a2412d141fa33ab688571da80bfd1fd8a0d79..8af091d55d9cb67554e7c71dfe4821eb2e87c33f 100644 (file)
--- a/src/control/media_library.c
+++ b/src/control/media_library.c
@@ -57,8 +57,7 @@ struct libvlc_media_library_t
  *       new (Public)
  **************************************************************************/
 libvlc_media_library_t *
-libvlc_media_library_new( libvlc_instance_t * p_inst,
-                          libvlc_exception_t * p_e )
+libvlc_media_library_new( libvlc_instance_t * p_inst )
 {
     libvlc_media_library_t * p_mlib;
 
@@ -71,7 +70,12 @@ libvlc_media_library_new( libvlc_instance_t * p_inst,
     p_mlib->i_refcount = 1;
     p_mlib->p_mlist = NULL;
 
-    p_mlib->p_event_manager = libvlc_event_manager_new( p_mlib, p_inst, p_e );
+    p_mlib->p_event_manager = libvlc_event_manager_new( p_mlib, p_inst );
+    if( unlikely(p_mlib->p_event_manager == NULL) )
+    {
+        free(p_mlib);
+        return NULL;
+    }
 
     return p_mlib;
 }
@@ -126,9 +130,7 @@ libvlc_media_library_load( libvlc_media_library_t * p_mlib,
     if( p_mlib->p_mlist )
         libvlc_media_list_release( p_mlib->p_mlist );
 
-    p_mlib->p_mlist = libvlc_media_list_new(
-                        p_mlib->p_libvlc_instance,
-                        p_e );
+    p_mlib->p_mlist = libvlc_media_list_new( p_mlib->p_libvlc_instance );
 
     libvlc_media_list_add_file_content( p_mlib->p_mlist, psz_uri, p_e );
     free( psz_uri );