From f47001b7b2808ece66a1949b0a4a9b1bb2818490 Mon Sep 17 00:00:00 2001
From: vanhofen <vanhofen@gmx.de>
Date: Mon, 15 Jun 2020 12:03:20 +0200
Subject: [PATCH] glcdsetup: disable analog clock in standby mode; front
 display is flickering as hell

Origin commit data
------------------
Commit: https://github.com/neutrino-images/ni-neutrino/commit/8cad105bde8386a6a9e5f2239162a990eb63121a
Author: vanhofen <vanhofen@gmx.de>
Date: 2020-06-15 (Mon, 15 Jun 2020)

Origin message was:
------------------
- glcdsetup: disable analog clock in standby mode; front display is flickering as hell
---
 src/gui/glcdsetup.cpp | 2 +-
 src/neutrino.cpp      | 6 ++++++
 version_pseudo.h      | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/gui/glcdsetup.cpp b/src/gui/glcdsetup.cpp
index 5ca817f9b..c3286d2d1 100644
--- a/src/gui/glcdsetup.cpp
+++ b/src/gui/glcdsetup.cpp
@@ -223,7 +223,7 @@ static const CMenuOptionChooser::keyval GLCD_CLOCK_OPTIONS[] = {
 	{ nGLCD::CLOCK_OFF,		LOCALE_OPTIONS_OFF },
 	{ nGLCD::CLOCK_DIGITAL_HM,	LOCALE_GLCD_CLOCK_DIGITAL_HM },
 //	{ nGLCD::CLOCK_DIGITAL_HMS,	LOCALE_GLCD_CLOCK_DIGITAL_HMS },
-	{ nGLCD::CLOCK_ANALOG,		LOCALE_GLCD_CLOCK_ANALOG }
+//	{ nGLCD::CLOCK_ANALOG,		LOCALE_GLCD_CLOCK_ANALOG }
 };
 #define GLCD_CLOCK_OPTIONS_COUNT (sizeof(GLCD_CLOCK_OPTIONS)/sizeof(CMenuOptionChooser::keyval))
 
diff --git a/src/neutrino.cpp b/src/neutrino.cpp
index 59068dba5..cd9406275 100644
--- a/src/neutrino.cpp
+++ b/src/neutrino.cpp
@@ -1400,6 +1400,12 @@ void CNeutrinoApp::upgradeSetup(const char * fname)
 	{
 		configfile.deleteKey("channellist_primetime");
 	}
+	if (g_settings.version_pseudo < "20200615000000")
+	{
+		// disable analog clock in standby mode
+		if (g_settings.glcd_time_in_standby > 1)
+			g_settings.glcd_time_in_standby = 1;
+	}
 
 	g_settings.version_pseudo = NEUTRINO_VERSION_PSEUDO;
 	configfile.setString("version_pseudo", g_settings.version_pseudo);
diff --git a/version_pseudo.h b/version_pseudo.h
index fa7978798..9df8b0bfd 100644
--- a/version_pseudo.h
+++ b/version_pseudo.h
@@ -1 +1 @@
-#define NEUTRINO_VERSION_PSEUDO "20190305000000"
+#define NEUTRINO_VERSION_PSEUDO "20200615000000"