Skins: fix the popup-menu appearance on the video.

[vlc] / modules / services_discovery / upnp_intel.cpp

diff --git a/modules/services_discovery/upnp_intel.cpp b/modules/services_discovery/upnp_intel.cpp
index 3876947df76f57816e0652c14af796d16b80c0d0..f64a74bb056cddb75698c35b0a8ffe68bad39725 100644 (file)
--- a/modules/services_discovery/upnp_intel.cpp
+++ b/modules/services_discovery/upnp_intel.cpp
@@ -90,12 +90,11 @@ static int Open( vlc_object_t *p_this )
     if(!(p_sd->p_sys = p_sys))
         return VLC_ENOMEM;
 
-    services_discovery_SetLocalizedName( p_sd, _("UPnP devices") );
-
     res = UpnpInit( 0, 0 );
     if( res != UPNP_E_SUCCESS )
     {
         msg_Err( p_sd, "%s", UpnpGetErrorMessage( res ) );
+        free( p_sys );
         return VLC_EGENERIC;
     }
 
@@ -654,14 +653,6 @@ void MediaServer::fetchContents()
     Container* root = new Container( 0, "0", getFriendlyName() );
     _fetchContents( root );
 
-   // if ( _contents )
-   // {
-   //     PL_LOCK;
-   //     playlist_NodeEmpty( p_playlist, _playlistNode, true );
-   //     PL_UNLOCK;
-   //     delete _contents;
-   // }
-
     _contents = root;
     _contents->setInputItem( _inputItem );