mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-28 16:01:10 +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:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/gui/lua/lua_misc.cpp
	src/neutrino.cpp
	src/system/locals.h
	src/system/locals_intern.h


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



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-11-19 21:11:54 +01:00
parent b0a78885b0 705930e152
commit a413bfb40d
112 changed files with 2965 additions and 2923 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/timerd/timermanager.cpp
View File

@@ -1254,8 +1254,6 @@ void CTimerEvent_Record::announceEvent()
//------------------------------------------------------------
void CTimerEvent_Record::stopEvent()
{
if (adjustToCurrentEPG())
return;
CTimerd::RecordingStopInfo stopinfo;
// Set EPG-ID if not set
stopinfo.eventID = eventID;