From f96beaeb2f107afd6e2b4400cbe6aa5f196333db Mon Sep 17 00:00:00 2001 From: "[CST] Focus" Date: Fri, 1 Nov 2013 09:08:58 +0400 Subject: [PATCH] gui/scan_setup.cpp: fix ddc3919eb9a0475304f649675e0c63c49f5b0094, do not show tuner name in tuner select menu for easymenu mode Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/de8262f03f47473af6bfd0476cfa5109e5323e8e Author: [CST] Focus Date: 2013-11-01 (Fri, 01 Nov 2013) ------------------ This commit was generated by Migit --- src/gui/scan_setup.cpp | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/gui/scan_setup.cpp b/src/gui/scan_setup.cpp index f9f563b64..dae229838 100644 --- a/src/gui/scan_setup.cpp +++ b/src/gui/scan_setup.cpp @@ -537,11 +537,15 @@ int CScanSetup::showScanMenuFrontendSetup() snprintf(tmp, sizeof(tmp), "config_frontend%d", i); char name[255]; - if (fe->getInfo()->type == FE_QPSK) - snprintf(name, sizeof(name), "%s %d: %s %s", g_Locale->getText(LOCALE_SATSETUP_FE_SETUP), i+1, - fe->getInfo()->type == FE_QPSK ? g_Locale->getText(LOCALE_SCANTS_ACTSATELLITE) - : g_Locale->getText(LOCALE_SCANTS_ACTCABLE), - fe->getInfo()->name); + if (g_settings.easymenu) + snprintf(name, sizeof(name), "%s %d: %s", g_Locale->getText(LOCALE_SATSETUP_FE_SETUP), i+1, + fe->getInfo()->type == FE_QPSK ? g_Locale->getText(LOCALE_SCANTS_ACTSATELLITE) + : g_Locale->getText(LOCALE_SCANTS_ACTCABLE)); + else + snprintf(name, sizeof(name), "%s %d: %s %s", g_Locale->getText(LOCALE_SATSETUP_FE_SETUP), i+1, + fe->getInfo()->type == FE_QPSK ? g_Locale->getText(LOCALE_SCANTS_ACTSATELLITE) + : g_Locale->getText(LOCALE_SCANTS_ACTCABLE), + fe->getInfo()->name); const char * icon = NULL; neutrino_msg_t key = CRCInput::RC_nokey;