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 
Origin commit data
------------------
Branch: ni/coolstream
Commit: fc302d8871
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-07-01 (Sat, 01 Jul 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
gixxpunk
2017-07-01 10:55:12 +02:00
parent 1de547cd24 9473eabf2a
commit 37d71e249d
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/timerlist.cpp
View File

@@ -1827,7 +1827,7 @@ int CTimerList::newTimer()
bool CTimerList::askUserOnRemoteTimerConflict(time_t announceTime, time_t stopTime, char * remotebox_name)
{
CTimerd::TimerList overlappingTimers;
int pre,post;
int pre = 0,post = 0;
Timer->getRecordingSafety(pre,post);
for (CTimerd::TimerList::iterator it = timerlist.begin(); it != timerlist.end();++it)