Avoid a segfault when services_discovery_GetServicesNames fail.

[vlc] / modules / gui / qt4 / menus.cpp

diff --git a/modules/gui/qt4/menus.cpp b/modules/gui/qt4/menus.cpp
index abbbb17c413a9984a344b6dc942f0915936861ab..e76a793c05f571c2bfeb242d66fe06e0f7fd45d4 100644 (file)
--- a/modules/gui/qt4/menus.cpp
+++ b/modules/gui/qt4/menus.cpp
@@ -310,7 +310,7 @@ QMenu *QVLCMenu::ToolsMenu( intf_thread_t *p_intf,
                       SLOT( bookmarksDialog() ), "Ctrl+B" );
 #ifdef ENABLE_VLM
     addDPStaticEntry( menu, qtr( I_MENU_VLM ), "", "", SLOT( vlmDialog() ),
-        "Ctrl+V" );
+        "Ctrl+W" );
 #endif
 
     menu->addSeparator();
@@ -332,20 +332,6 @@ QMenu *QVLCMenu::InterfacesMenu( intf_thread_t *p_intf, QMenu *current )
 
     QMenu *menu = Populate( p_intf, current, varnames, objects );
 
-    if( !p_intf->pf_show_dialog )
-    {
-        menu->addSeparator();
-        menu->addAction( qtr( "Switch to skins" ), THEDP,
-                SLOT( switchToSkins() ), QString( "Ctrl+Z" ) );
-#ifdef HAVE_WX
-        if( module_Exists( VLC_OBJECT( p_intf ), "wxwidgets" ) )
-        {
-            menu->addAction( qtr( "Switch to WxWidgets" ), THEDP,
-                    SLOT( switchToWx() ) );
-        }
-#endif
-    }
-
     CONNECT( menu, aboutToShow(), THEDP->menusUpdateMapper, map() );
     THEDP->menusUpdateMapper->setMapping( menu, 4 );
     return menu;
@@ -442,6 +428,9 @@ QMenu *QVLCMenu::SDMenu( intf_thread_t *p_intf )
     char **ppsz_longnames;
     char **ppsz_names = services_discovery_GetServicesNames( p_intf,
                                                              &ppsz_longnames );
+    if( !ppsz_names )
+        return menu;
+
     char **ppsz_name = ppsz_names, **ppsz_longname = ppsz_longnames;
     for( ; *ppsz_name; ppsz_name++, ppsz_longname++ )
     {
@@ -476,7 +465,7 @@ QMenu *QVLCMenu::HelpMenu()
     addDPStaticEntry( menu, qtr( "Help..." ) , "",
         ":/pixmaps/menus_help_16px.png", SLOT( helpDialog() ), "F1" );
 #ifdef UPDATE_CHECK
-    addDPStaticEntry( menu, qtr( "Update" ) , "", "", SLOT( updateDialog() ), "");
+    addDPStaticEntry( menu, qtr( "Check for updates..." ) , "", "", SLOT( updateDialog() ), "");
 #endif
     menu->addSeparator();
     addDPStaticEntry( menu, qtr( I_MENU_ABOUT ), "", "", SLOT( aboutDialog() ),
@@ -817,8 +806,6 @@ static bool IsMenuEmpty( const char *psz_var,
 
     if( ( i_type & VLC_VAR_TYPE ) != VLC_VAR_VARIABLE )
     {
-        /* Very evil hack ! intf-switch can have only one value */
-        if( !strcmp( psz_var, "intf-switch" ) ) return false;
         if( val.i_int == 1 && b_root ) return true;
         else return false;
     }