diff options
Diffstat (limited to 'searchtimer_thread.c')
| -rw-r--r-- | searchtimer_thread.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/searchtimer_thread.c b/searchtimer_thread.c index 39a21ca..ab9687a 100644 --- a/searchtimer_thread.c +++ b/searchtimer_thread.c @@ -551,9 +551,15 @@ void cSearchTimerThread::Action(void) conflictCheck.EvaluateConflCheckCmd(); - cString msgfmt = cString::sprintf(tr("%d timer conflict(s)! First at %s. Show them?"), - conflictCheck.relevantConflicts, - *DateTime(conflictCheck.nextRelevantConflictDate)); + cString msgfmt = ""; + if (conflictCheck.relevantConflicts == 1) + msgfmt = cString::sprintf(tr("timer conflict at %s! Show it?"), + *DateTime(conflictCheck.nextRelevantConflictDate)); + else + msgfmt = cString::sprintf(tr("%d timer conflict(s)! First at %s. Show them?"), + conflictCheck.relevantConflicts, + *DateTime(conflictCheck.nextRelevantConflictDate)); + bool doMessage = EPGSearchConfig.noConflMsgWhileReplay == 0 || !cDevice::PrimaryDevice()->Replaying() || conflictCheck.nextRelevantConflictDate - now < 2*60*60 || |