From 8f2d77911f17661cd685b0f90bb761e3a14b223d Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Tue, 6 Nov 2012 19:07:03 +0100 Subject: [PATCH] videosettings: only show 'TV SCART' if box has SCART Boxes without hw_caps->has_SCART still showed an empty "TV SCART" section. Remove the leftover menu separator line. --- src/gui/videosettings.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/gui/videosettings.cpp b/src/gui/videosettings.cpp index 7e60484aa..d56d99ab3 100644 --- a/src/gui/videosettings.cpp +++ b/src/gui/videosettings.cpp @@ -329,8 +329,11 @@ int CVideoSettings::showVideoSetup() vs_videomodes_fw->setHint("", LOCALE_MENU_HINT_VIDEO_MODES); } + neutrino_locale_t tmp_locale = NONEXISTANT_LOCALE; + if (vs_analg_ch != NULL || vs_scart_ch != NULL || vs_chinch_ch != NULL) + tmp_locale = LOCALE_VIDEOMENU_TV_SCART; //--------------------------------------- - videosetup->addIntroItems(LOCALE_MAINSETTINGS_VIDEO, LOCALE_VIDEOMENU_TV_SCART); + videosetup->addIntroItems(LOCALE_MAINSETTINGS_VIDEO, tmp_locale); //--------------------------------------- //videosetup->addItem(vs_scart_sep); //separator scart if (vs_analg_ch != NULL) @@ -339,7 +342,8 @@ int CVideoSettings::showVideoSetup() videosetup->addItem(vs_scart_ch); //scart if (vs_chinch_ch != NULL) videosetup->addItem(vs_chinch_ch);//chinch - videosetup->addItem(GenericMenuSeparatorLine); + if (tmp_locale != NONEXISTANT_LOCALE) + videosetup->addItem(GenericMenuSeparatorLine); //--------------------------------------- videosetup->addItem(vs_43mode_ch); //4:3 mode videosetup->addItem(vs_dispformat_ch); //display format