From 29e55a8eec2800a59d05211579b7258a7ff9ff58 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Mon, 31 May 2021 23:23:43 +0200 Subject: [PATCH] lcd4linux: fix first start Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/e4f3e6faaf746df7b8543539d89419cb105de499 Author: vanhofen Date: 2021-05-31 (Mon, 31 May 2021) Origin message was: ------------------ - lcd4linux: fix first start ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/driver/lcd4l.cpp | 3 ++- src/neutrino.cpp | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/driver/lcd4l.cpp b/src/driver/lcd4l.cpp index 0134c1263..91bc742c9 100644 --- a/src/driver/lcd4l.cpp +++ b/src/driver/lcd4l.cpp @@ -625,7 +625,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 = ""; int ChannelNr = 0; @@ -812,6 +812,7 @@ void CLCD4l::ParseInfo(uint64_t parseID, bool newID, bool firstRun) case 1: Layout = DisplayType + "large"; break; + case 0: default: Layout = DisplayType + "standard"; } diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 60252d765..78e2ad37e 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -3128,11 +3128,11 @@ TIMER_START(); SHTDCNT::getInstance()->init(); #ifdef ENABLE_LCD4LINUX - if (g_settings.lcd4l_support) { - if (LCD4l == NULL) - LCD4l = new CLCD4l(); + if (LCD4l == NULL) + LCD4l = new CLCD4l(); + + if (g_settings.lcd4l_support) LCD4l->StartLCD4l(); - } #endif CZapit::getInstance()->SetScanSDT(g_settings.enable_sdt);