From e28941a1c7533c418723181beeb84e23ab78de9b Mon Sep 17 00:00:00 2001 From: GetAway Date: Tue, 1 Jan 2019 23:22:34 +0100 Subject: [PATCH] l4l: remove hardcoded path; start with full path Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/7e12a6df60baaebd6fde8b7a540ed9252856ad39 Author: GetAway Date: 2019-01-01 (Tue, 01 Jan 2019) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/miscsettings_menu.cpp | 2 +- src/gui/user_menue.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gui/miscsettings_menu.cpp b/src/gui/miscsettings_menu.cpp index a397d61cf..59e5d0682 100644 --- a/src/gui/miscsettings_menu.cpp +++ b/src/gui/miscsettings_menu.cpp @@ -327,7 +327,7 @@ int CMiscMenue::showMiscSettingsMenu() // LCD4Linux Setup CLCD4lSetup lcd4lSetup; - mf = new CMenuForwarder(LOCALE_LCD4L_SUPPORT, true, NULL, &lcd4lSetup, NULL, CRCInput::RC_7); + mf = new CMenuForwarder(LOCALE_LCD4L_SUPPORT, !find_executable("lcd4linux").empty(), NULL, &lcd4lSetup, NULL, CRCInput::RC_7); mf->setHint(NEUTRINO_ICON_HINT_LCD4LINUX, LOCALE_MENU_HINT_LCD4L_SUPPORT); misc_menue.addItem(mf); diff --git a/src/gui/user_menue.cpp b/src/gui/user_menue.cpp index c4300b039..e1768908a 100644 --- a/src/gui/user_menue.cpp +++ b/src/gui/user_menue.cpp @@ -530,7 +530,7 @@ bool CUserMenu::showUserMenu(neutrino_msg_t msg) case SNeutrinoSettings::ITEM_LCD4LINUX: { keyhelper.get(&key,&icon); - menu_item = new CMenuForwarder(LOCALE_LCD4L_SUPPORT, ((access("/usr/bin/lcd4linux", F_OK) == 0) || (access("/var/bin/lcd4linux", F_OK) == 0)), NULL, CLCD4lSetup::getInstance(), NULL, key, icon); + menu_item = new CMenuForwarder(LOCALE_LCD4L_SUPPORT, !find_executable("lcd4linux").empty(), NULL, CLCD4lSetup::getInstance(), NULL, key, icon); menu_item->setHint(NEUTRINO_ICON_HINT_LCD4LINUX, LOCALE_MENU_HINT_LCD4L_SUPPORT); break; }