From 46f9c236354026fb267dc9c8166075f5d772e5d0 Mon Sep 17 00:00:00 2001 From: "[CST] Focus" Date: Mon, 1 Apr 2013 14:49:36 +0400 Subject: [PATCH] gui/timerlist.cpp: check CFEManager::getEnabledCount in place of CFEManager::FE_MODE_SINGLE Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/fb7c0963ccb236dddbcad78e692da22cb7b267f2 Author: [CST] Focus Date: 2013-04-01 (Mon, 01 Apr 2013) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/timerlist.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/timerlist.cpp b/src/gui/timerlist.cpp index 9da35659a..d06f5ea6b 100644 --- a/src/gui/timerlist.cpp +++ b/src/gui/timerlist.cpp @@ -1251,7 +1251,7 @@ int CTimerList::newTimer() bool askUserOnTimerConflict(time_t announceTime, time_t stopTime) { - if (CFEManager::getInstance()->getMode() == CFEManager::FE_MODE_SINGLE){ + if (CFEManager::getInstance()->getEnabledCount() == 1) { 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);