From 6fdc01c0e7b57459ef72b4a92d2354a09103bad7 Mon Sep 17 00:00:00 2001 From: svenhoefer Date: Sun, 16 Dec 2018 01:17:01 +0100 Subject: [PATCH] - fix latest key changes (KEY_EXIT => KEY_HOME) Conflicts: src/neutrino.cpp version_pseudo.h Signed-off-by: Thilo Graf --- src/neutrino.cpp | 8 ++++++++ version_pseudo.h | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 7bb1ed262..91746e88b 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -1206,6 +1206,14 @@ void CNeutrinoApp::upgradeSetup(const char * fname) //remove easymenu configfile.deleteKey("easymenu"); } + if (g_settings.version_pseudo < "20181216000000") + { + // apply key changes; KEY_EXIT => KEY_HOME + if (g_settings.key_channelList_cancel == 174) + g_settings.key_channelList_cancel = 102; + if (g_settings.key_zaphistory == 174) + g_settings.key_zaphistory = 102; + } 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 d32ebccc9..a537bcba7 100644 --- a/version_pseudo.h +++ b/version_pseudo.h @@ -1 +1 @@ -#define NEUTRINO_VERSION_PSEUDO "20170913110000" +#define NEUTRINO_VERSION_PSEUDO "20181216000000"