mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-29 16:31:05 +02:00
CTimerList: show warnings on overlapping recording only in single mode
NOTE: Only tested on single box by me, please send feedback
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5a5ec2bba0
Author: Thilo Graf <dbt@novatux.de>
Date: 2012-08-30 (Thu, 30 Aug 2012)
Origin message was:
------------------
*CTimerList: show warnings on overlapping recording only in single mode
NOTE: Only tested on single box by me, please send feedback
------------------
This commit was generated by Migit
This commit is contained in:
@@ -66,6 +66,7 @@
|
||||
|
||||
#include <zapit/getservices.h>
|
||||
#include <zapit/bouquets.h>
|
||||
#include <zapit/femanager.h>
|
||||
|
||||
#include <eitd/sectionsd.h>
|
||||
|
||||
@@ -1210,6 +1211,7 @@ int CTimerList::newTimer()
|
||||
|
||||
bool askUserOnTimerConflict(time_t announceTime, time_t stopTime)
|
||||
{
|
||||
if (CFEManager::getInstance()->getMode() == CFEManager::FE_MODE_SINGLE){
|
||||
CTimerdClient Timer;
|
||||
CTimerd::TimerList overlappingTimers = Timer.getOverlappingTimers(announceTime,stopTime);
|
||||
//printf("[CTimerdClient] attention\n%d\t%d\t%d conflicts with:\n",timerNew.announceTime,timerNew.alarmTime,timerNew.stopTime);
|
||||
@@ -1258,3 +1260,6 @@ bool askUserOnTimerConflict(time_t announceTime, time_t stopTime)
|
||||
|
||||
return (ShowMsgUTF(LOCALE_MESSAGEBOX_INFO,timerbuf,CMessageBox::mbrNo,CMessageBox::mbNo|CMessageBox::mbYes) == CMessageBox::mbrYes);
|
||||
}
|
||||
else
|
||||
return true;
|
||||
}
|
||||
|
Reference in New Issue
Block a user