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

Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Browse Source 
Conflicts:
	src/gui/record_setup.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 1f3cc2bbaa
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-07 (Wed, 07 Jun 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-06-07 15:41:49 +02:00
parent e341deaadf ab03a37a9a
commit 616613f29f
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/record_setup.cpp
View File

@@ -358,7 +358,7 @@ void CRecordSetup::showRecordTimerSetup(CMenuWidget *menu_timersettings)
menu_timersettings->addItem(GenericMenuSeparatorLine); menu_timersettings->addItem(GenericMenuSeparatorLine);
//allow followscreenings //allow followscreenings
CMenuOptionChooser* followscreenings = new CMenuOptionChooser(LOCALE_TIMERSETTINGS_FOLLOWSCREENINGS, &g_settings.timer_followscreenings, timer_followscreenings_options, timer_followscreenings_options_count, true); //NI CMenuOptionChooser* followscreenings = new CMenuOptionChooser(LOCALE_TIMERSETTINGS_FOLLOWSCREENINGS, &g_settings.timer_followscreenings, timer_followscreenings_options, timer_followscreenings_options_count, true);
followscreenings->setHint("", LOCALE_MENU_HINT_TIMER_FOLLOWSCREENINGS); followscreenings->setHint("", LOCALE_MENU_HINT_TIMER_FOLLOWSCREENINGS);
menu_timersettings->addItem(followscreenings); menu_timersettings->addItem(followscreenings);
} }