mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-28 07:51:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

l4l: remove hardcoded path; start with full path

Browse Source
This commit is contained in:
GetAway
2019-01-01 23:22:34 +01:00
parent c8fcf927d9
commit ed435a5fea
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/driver/lcd4l.cpp
View File

@@ -113,6 +113,7 @@ static void lcd4linux(bool run)
{ {
const char *buf = "lcd4linux"; const char *buf = "lcd4linux";
const char *conf = "/etc/lcd4linux.conf"; const char *conf = "/etc/lcd4linux.conf";
std::string lcd4linux = find_executable(buf);
chmod(conf,0x600); chmod(conf,0x600);
chown(conf,0,0); chown(conf,0,0);
@@ -121,11 +122,11 @@ static void lcd4linux(bool run)
{ {
if (g_settings.lcd4l_dpf_type == 3) if (g_settings.lcd4l_dpf_type == 3)
{ {
if (my_system(3, buf, "-o", PNGFILE) != 0) if (my_system(3, lcd4linux.c_str(), "-o", PNGFILE) != 0)
printf("[CLCD4l] %s: executing '%s -o %s' failed\n", __FUNCTION__, buf, PNGFILE); printf("[CLCD4l] %s: executing '%s -o %s' failed\n", __FUNCTION__, lcd4linux.c_str(), PNGFILE);
} else { } else {
if (my_system(1, buf) != 0) if (my_system(1, lcd4linux.c_str()) != 0)
printf("[CLCD4l] %s: executing '%s' failed\n", __FUNCTION__, buf); printf("[CLCD4l] %s: executing '%s' failed\n", __FUNCTION__, lcd4linux.c_str());
} }
sleep(2); sleep(2);
} }

2
src/gui/miscsettings_menu.cpp
View File

@@ -306,7 +306,7 @@ int CMiscMenue::showMiscSettingsMenu()
#ifdef ENABLE_LCD4LINUX #ifdef ENABLE_LCD4LINUX
// LCD4Linux Setup // LCD4Linux Setup
CLCD4lSetup lcd4lSetup; CLCD4lSetup lcd4lSetup;
mf = new CMenuForwarder(LOCALE_LCD4L_SUPPORT, ((access("/usr/bin/lcd4linux", F_OK) == 0) || (access("/var/bin/lcd4linux", F_OK) == 0)), NULL, &lcd4lSetup, NULL, CRCInput::RC_4); mf = new CMenuForwarder(LOCALE_LCD4L_SUPPORT, !find_executable("lcd4linux").empty(), NULL, &lcd4lSetup, NULL, CRCInput::RC_4);
misc_menue.addItem(mf); misc_menue.addItem(mf);
#endif #endif

2
src/gui/user_menue.cpp
View File

@@ -494,7 +494,7 @@ bool CUserMenu::showUserMenu(neutrino_msg_t msg)
case SNeutrinoSettings::ITEM_LCD4LINUX: case SNeutrinoSettings::ITEM_LCD4LINUX:
{ {
keyhelper.get(&key,&icon); 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); menu_item->setHint(NEUTRINO_ICON_HINT_LCD4LINUX, LOCALE_MENU_HINT_LCD4L_SUPPORT);
break; break;
} }