diff options
Diffstat (limited to 'menu_conflictcheck.c')
| -rw-r--r-- | menu_conflictcheck.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/menu_conflictcheck.c b/menu_conflictcheck.c index 4450f25..88d1a0e 100644 --- a/menu_conflictcheck.c +++ b/menu_conflictcheck.c @@ -182,9 +182,15 @@ bool cMenuConflictCheckDetailsItem::Update(bool Force) if (!timerObj->conflCheckTime && timerObj->device > -1) sprintf(device, "%d", timerObj->device+1); else - strcpy(device, tr("C")); + { + if (timer->Local()) + strcpy(device, tr("C")); + else + strcpy(device, "R"); //Remote Timer + } } +// cString buffer = cString::sprintf("%s\t%s\t%d\t%s - %s\t%d\t%s\t%s", hasTimer?">":"", timer->Remote()?timer->Remote():"", timer->Channel()->Number(), TIMESTRING(timerObj->start), TIMESTRING(timerObj->stop), timer->Priority(), device, timer->File()); cString buffer = cString::sprintf("%s\t%d\t%s - %s\t%d\t%s\t%s", hasTimer?">":"", timer->Channel()->Number(), TIMESTRING(timerObj->start), TIMESTRING(timerObj->stop), timer->Priority(), device, timer->File()); SetText(buffer); @@ -300,6 +306,11 @@ eOSState cMenuConflictCheckDetails::DeleteTimer(cConflictCheckTimerObj* TimerObj else return osContinue; } + if (!HandleRemoteTimerModifications(NULL,timer)) + { + LogFile.Log(2,"HandleRemoteTimerModifications failed"); + return osContinue; + } LogFile.iSysLog("deleting timer %s", *timer->ToDescr()); Timers->Del(timer); cOsdMenu::Del(Current()); |