mirror of
https://github.com/tuxbox-neutrino/neutrino.git
synced 2025-08-27 15:32:59 +02:00
- lcd4linux: fix first start
Signed-off-by: Thilo Graf <dbt@novatux.de> # Conflicts: # src/driver/lcd4l.cpp
This commit is contained in:
@@ -664,7 +664,7 @@ void CLCD4l::ParseInfo(uint64_t parseID, bool newID, bool firstRun)
|
|||||||
|
|
||||||
/* ----------------------------------------------------------------- */
|
/* ----------------------------------------------------------------- */
|
||||||
|
|
||||||
if (newID || parseID == NeutrinoModes::mode_audio || parseID == NeutrinoModes::mode_ts)
|
if (firstRun || newID || parseID == NeutrinoModes::mode_audio || parseID == NeutrinoModes::mode_ts)
|
||||||
{
|
{
|
||||||
std::string Service = "";
|
std::string Service = "";
|
||||||
int ChannelNr = 0;
|
int ChannelNr = 0;
|
||||||
@@ -852,6 +852,7 @@ void CLCD4l::ParseInfo(uint64_t parseID, bool newID, bool firstRun)
|
|||||||
case 1:
|
case 1:
|
||||||
Layout = DisplayType + "user01" + eol;
|
Layout = DisplayType + "user01" + eol;
|
||||||
break;
|
break;
|
||||||
|
case 0:
|
||||||
default:
|
default:
|
||||||
Layout = DisplayType + "standard" + eol;
|
Layout = DisplayType + "standard" + eol;
|
||||||
}
|
}
|
||||||
|
@@ -3056,11 +3056,11 @@ TIMER_START();
|
|||||||
SHTDCNT::getInstance()->init();
|
SHTDCNT::getInstance()->init();
|
||||||
|
|
||||||
#ifdef ENABLE_LCD4LINUX
|
#ifdef ENABLE_LCD4LINUX
|
||||||
if (g_settings.lcd4l_support) {
|
if (LCD4l == NULL)
|
||||||
if (LCD4l == NULL)
|
LCD4l = new CLCD4l();
|
||||||
LCD4l = new CLCD4l();
|
|
||||||
|
if (g_settings.lcd4l_support)
|
||||||
LCD4l->StartLCD4l();
|
LCD4l->StartLCD4l();
|
||||||
}
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
CZapit::getInstance()->SetScanSDT(g_settings.enable_sdt);
|
CZapit::getInstance()->SetScanSDT(g_settings.enable_sdt);
|
||||||
|
Reference in New Issue
Block a user