From 66258704bfb33985f80a3475072744fb26ae68fd Mon Sep 17 00:00:00 2001
From: svenhoefer <svenhoefer@svenhoefer.com>
Date: Thu, 3 Mar 2016 09:04:08 +0100
Subject: [PATCH] - neutrino: add upgradeSetup function ...

... to upgrade neutrino.conf to new defaults if needed
---
 src/neutrino.cpp | 21 +++++++++++++++++++++
 src/neutrino.h   |  1 +
 version_pseudo.h |  2 +-
 3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/src/neutrino.cpp b/src/neutrino.cpp
index 028df3ea3..e5b85fb50 100644
--- a/src/neutrino.cpp
+++ b/src/neutrino.cpp
@@ -912,11 +912,32 @@ int CNeutrinoApp::loadSetup(const char * fname)
 
 	g_settings.version_pseudo = configfile.getString("version_pseudo", "19700101000000");
 
+	if (g_settings.version_pseudo < NEUTRINO_VERSION_PSEUDO)
+		upgradeSetup(fname);
+
 	if(erg)
 		configfile.setModifiedFlag(true);
 	return erg;
 }
 
+void CNeutrinoApp::upgradeSetup(const char * fname)
+{
+	if (g_settings.version_pseudo < "20160226110000")
+	{
+		if (g_settings.usermenu[SNeutrinoSettings::BUTTON_YELLOW]->items == "7")
+		{
+			g_settings.usermenu[SNeutrinoSettings::BUTTON_YELLOW]->items = "7,31";
+			configfile.setString("usermenu_tv_yellow", g_settings.usermenu[SNeutrinoSettings::BUTTON_YELLOW]->items);
+		}
+	}
+
+	g_settings.version_pseudo = NEUTRINO_VERSION_PSEUDO;
+	configfile.setString("version_pseudo", g_settings.version_pseudo);
+
+	if (configfile.getModifiedFlag())
+		configfile.saveConfig(fname);
+}
+
 /**************************************************************************************
 *          CNeutrinoApp -  saveSetup, save the application-settings                   *
 **************************************************************************************/
diff --git a/src/neutrino.h b/src/neutrino.h
index d65f6760c..17508a1f2 100644
--- a/src/neutrino.h
+++ b/src/neutrino.h
@@ -162,6 +162,7 @@ public:
 
 	void saveSetup(const char * fname);
 	int loadSetup(const char * fname);
+	void upgradeSetup(const char * fname);
 	void loadKeys(const char * fname = NULL);
 	void saveKeys(const char * fname = NULL);
 	void SetupTiming();
diff --git a/version_pseudo.h b/version_pseudo.h
index 3b2ae8143..56e5e0b75 100644
--- a/version_pseudo.h
+++ b/version_pseudo.h
@@ -1 +1 @@
-#define NEUTRINO_VERSION_PSEUDO "19700101000000"
+#define NEUTRINO_VERSION_PSEUDO "20160226110000"