*CTimerList: show warnings on overlapping recording only in single mode

NOTE: Only tested on single box by me, please send feedback
This commit is contained in:
2012-08-30 15:55:53 +02:00
parent 807dce9497
commit 5a5ec2bba0

View File

@@ -66,6 +66,7 @@
#include <zapit/getservices.h> #include <zapit/getservices.h>
#include <zapit/bouquets.h> #include <zapit/bouquets.h>
#include <zapit/femanager.h>
#include <eitd/sectionsd.h> #include <eitd/sectionsd.h>
@@ -1210,6 +1211,7 @@ int CTimerList::newTimer()
bool askUserOnTimerConflict(time_t announceTime, time_t stopTime) bool askUserOnTimerConflict(time_t announceTime, time_t stopTime)
{ {
if (CFEManager::getInstance()->getMode() == CFEManager::FE_MODE_SINGLE){
CTimerdClient Timer; CTimerdClient Timer;
CTimerd::TimerList overlappingTimers = Timer.getOverlappingTimers(announceTime,stopTime); 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); //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); return (ShowMsgUTF(LOCALE_MESSAGEBOX_INFO,timerbuf,CMessageBox::mbrNo,CMessageBox::mbNo|CMessageBox::mbYes) == CMessageBox::mbrYes);
} }
else
return true;
}