From: Sébastien Escudier <sebastien-devel@celeos.eu>
Date: Fri, 12 Jun 2009 14:54:48 +0000 (+0200)
Subject: libvlc vlm init fix Don't test p_vlm twice if it wasn't NULL the first time Don't... 
X-Git-Tag: 1.1.0-ff~5473
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=e97c8b3668d04396e892ad80e9d5a33d1a72e24b;p=vlc

libvlc vlm init fix Don't test p_vlm twice if it wasn't NULL the first time Don't add the callback if the creation failed

Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>
---

diff --git a/src/control/vlm.c b/src/control/vlm.c
index 824d57d7f1..bbeb883aaf 100644
--- a/src/control/vlm.c
+++ b/src/control/vlm.c
@@ -159,15 +159,16 @@ static int libvlc_vlm_init( libvlc_instance_t *p_instance,
     if( !p_instance->p_vlm )
     {
         p_instance->p_vlm = vlm_New( p_instance->p_libvlc_int );
+        if( !p_instance->p_vlm )
+        {
+            libvlc_exception_raise( p_exception,
+                                    "Unable to create VLM." );
+            return VLC_EGENERIC;
+        }
         var_AddCallback( (vlc_object_t *)p_instance->p_vlm, "intf-event", VlmEvent,
                          p_instance->p_event_manager );
     }
-    if( !p_instance->p_vlm )
-    {
-        libvlc_exception_raise( p_exception,
-                                "Unable to create VLM." );
-        return VLC_EGENERIC;
-    }
+
     return VLC_SUCCESS;
 }
 #define VLM_RET(p,ret) do {                                     \