macosx: Fix controller playlist toggling to use the contentRect and not the window...

[vlc] / src / network / httpd.c

diff --git a/src/network/httpd.c b/src/network/httpd.c
index 8fdf75e9851ed8d0a94c6c377c5824a001fa4b71..86c7745209ac3208eba141dc6028faa489597cae 100644 (file)
--- a/src/network/httpd.c
+++ b/src/network/httpd.c
@@ -989,10 +989,7 @@ httpd_host_t *httpd_TLSHostNew( vlc_object_t *p_this, const char *psz_hostname,
 
     psz_host = strdup( psz_hostname );
     if( psz_host == NULL )
-    {
-        msg_Err( p_this, "memory error" );
         return NULL;
-    }
 
     /* to be sure to avoid multiple creation */
     var_Create( p_this->p_libvlc, "httpd_mutex", VLC_VAR_MUTEX );
@@ -1069,7 +1066,7 @@ httpd_host_t *httpd_TLSHostNew( vlc_object_t *p_this, const char *psz_hostname,
 
     /* create the new host */
     host = (httpd_host_t *)vlc_custom_create( p_this, sizeof (*host),
-                                              VLC_OBJECT_HTTPD_HOST,
+                                              VLC_OBJECT_GENERIC,
                                               psz_object_type );
     if (host == NULL)
         goto error;