libvlc vlm init fix Don't test p_vlm twice if it wasn't NULL the first time Don't...

[vlc] / src / control / vlm.c

diff --git a/src/control/vlm.c b/src/control/vlm.c
index 824d57d7f12115bd162c8ede4031ed90ecb329b6..bbeb883aaf495e2b7dbc0df50e5c05ef0c449064 100644 (file)
--- 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 {                                     \