From eaa78a1502a0f5f1ac71aa0ac481bb167d4cc10a Mon Sep 17 00:00:00 2001
From: svenhoefer <svenhoefer@svenhoefer.com>
Date: Sat, 5 Jun 2021 22:33:52 +0200
Subject: [PATCH] - lcd4linux: fix first start

Signed-off-by: Thilo Graf <dbt@novatux.de>

# Conflicts:
#	src/driver/lcd4l.cpp
---
 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 9b7b73e58..8449cdfdd 100644
--- a/src/driver/lcd4l.cpp
+++ b/src/driver/lcd4l.cpp
@@ -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 = "";
 		int ChannelNr = 0;
@@ -852,6 +852,7 @@ void CLCD4l::ParseInfo(uint64_t parseID, bool newID, bool firstRun)
 			case 1:
 				Layout = DisplayType + "user01" + eol;
 				break;
+			case 0:
 			default:
 				Layout = DisplayType + "standard" + eol;
 		}
diff --git a/src/neutrino.cpp b/src/neutrino.cpp
index afd1dc610..c1d0214ca 100644
--- a/src/neutrino.cpp
+++ b/src/neutrino.cpp
@@ -3056,11 +3056,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);