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

Merge /home/svenhoefer/cst-public-gui-neutrino into ni/cst-next

Browse Source 
Conflicts:
	src/gui/Makefile.am
	src/neutrino.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 0d42384f0d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-07-01 (Fri, 01 Jul 2016)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-07-01 15:28:37 +02:00
parent 4c0c75fd67 8da554c0fa
commit 2f8caeb659
17 changed files with 338 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/gui/epgview.cpp
View File

@@ -46,6 +46,7 @@
#include <driver/screen_max.h>
#include <driver/fade.h>
#include <gui/filebrowser.h>
#include <gui/followscreenings.h>
#include <gui/moviebrowser.h>
#include <gui/customcolor.h>
#include <gui/pictureviewer.h>
@@ -962,7 +963,16 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start
doRecord = (ShowMsg(LOCALE_RECORDING_ALREADY_FOUND_CHECK, message, CMessageBox::mbrYes, CMessageBox::mbYes | CMessageBox::mbNo) == CMessageBox::mbrYes);
}
}
if (doRecord)
if (doRecord && !call_fromfollowlist)
{
CFollowScreenings m(channel_id,
epgData.epg_times.startzeit,
epgData.epg_times.startzeit + epgData.epg_times.dauer,
epgData.title, epgData.eventID, TIMERD_APIDS_CONF, true, recDir, &evtlist);
m.exec(NULL, "");
timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_EPG]);
}
else if (doRecord)
{
if (g_Timerd->addRecordTimerEvent(channel_id,
epgData.epg_times.startzeit,