summaryrefslogtreecommitdiff
path: root/recmenuview.c
diff options
context:
space:
mode:
Diffstat (limited to 'recmenuview.c')
-rw-r--r--recmenuview.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/recmenuview.c b/recmenuview.c
index 53744c8..f15954e 100644
--- a/recmenuview.c
+++ b/recmenuview.c
@@ -121,7 +121,7 @@ bool cRecMenuView::DisplayTimerConflict(int timerID) {
cTVGuideTimerConflict *conflict = timerConflicts->GetCurrentConflict();
if (!conflict)
return false;
- activeMenu = new cRecMenuTimerConflict(conflict);
+ activeMenu = new cRecMenuTimerConflict(conflict, rmsIgnoreTimerConflict);
activeMenu->Display();
return true;
}
@@ -654,7 +654,7 @@ eOSState cRecMenuView::StateMachine(eRecMenuState nextState) {
} else break;
timerConflicts->SetCurrentConflict(timerConflict);
delete activeMenu;
- activeMenu = new cRecMenuTimerConflict(timerConflicts->GetCurrentConflict());
+ activeMenu = new cRecMenuTimerConflict(timerConflicts->GetCurrentConflict(), rmsTimerConflicts);
activeMenu->Display();
break; }
case rmsSearchRerunsTimerConflictMenu: {