mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-02 18:31:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

followscreenings: re-add possibility to show followscreenings in every case

Browse Source 
This commit replaces formerly commit 5b4e8952fa


Origin commit data
------------------
Branch: ni/coolstream
Commit: b7838210a8
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-15 (Tue, 15 Nov 2016)

Origin message was:
------------------
- followscreenings: re-add possibility to show followscreenings in every case

This commit replaces formerly commit 5b4e8952fa


------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-11-15 00:05:02 +01:00
parent ff9095e66b
commit aaf3946608
8 changed files with 29 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/neutrino.cpp
View File

@@ -1027,6 +1027,7 @@ void CNeutrinoApp::upgradeSetup(const char * fname)
configfile.setString("usermenu_tv_yellow", g_settings.usermenu[SNeutrinoSettings::BUTTON_YELLOW]->items);
}
}
//NI
if (g_settings.version_pseudo < "20160623110000")
{
if (g_settings.screen_xres == 112)
@@ -1035,11 +1036,21 @@ void CNeutrinoApp::upgradeSetup(const char * fname)
if (g_settings.screen_yres == 112)
g_settings.screen_yres = 105;
}
//NI
if (g_settings.version_pseudo < "20160804110000")
{
if (g_settings.tmdb_api_key == "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX")
g_settings.tmdb_api_key = "7270f1b571c4ecbb5b204ddb7f8939b1";
}
//NI
if (g_settings.version_pseudo < "20161411235900")
{
//convert and remove obsolete recording_tevents key
bool recording_tevents = configfile.getBool("recording_tevents", false);
if (recording_tevents)
g_settings.timer_followscreenings = 2 /*always*/;
configfile.deleteKey("recording_tevents");
}
g_settings.version_pseudo = NEUTRINO_VERSION_PSEUDO;
configfile.setString("version_pseudo", g_settings.version_pseudo);