mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-30 08:51:04 +02:00
add/use //NI tags instead of /*NI*/; just cosmetic changes
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7927af07cf
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-07-31 (Sun, 31 Jul 2016)
Origin message was:
------------------
- add/use //NI tags instead of /*NI*/; just cosmetic changes
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
This commit is contained in:
@@ -1268,7 +1268,7 @@ bool askUserOnTimerConflict(time_t announceTime, time_t stopTime, t_channel_id c
|
||||
CZapitChannel * channel = CServiceManager::getInstance()->FindChannel(channel_id);
|
||||
bool useCI = channel->bUseCI;
|
||||
|
||||
if (CFEManager::getInstance()->getEnabledCount() == 1 || /*NI*/useCI) {
|
||||
if (CFEManager::getInstance()->getEnabledCount() == 1 || useCI) { //NI
|
||||
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);
|
||||
|
Reference in New Issue
Block a user