Fixed messages in DisplayTimerConflict

3 files changed, 5 insertions, 5 deletions

diff --git a/recmenus.c b/recmenus.c
index 83777ac..90f8bf0 100644
--- a/recmenus.c
+++ b/recmenus.c
@@ -231,7 +231,7 @@ int cRecMenuTimerConflicts::GetTimerConflict(void) {
 }
 
 // --- cRecMenuTimerConflict  ---------------------------------------------------------
-cRecMenuTimerConflict::cRecMenuTimerConflict(cTVGuideTimerConflict *conflict) {
+cRecMenuTimerConflict::cRecMenuTimerConflict(cTVGuideTimerConflict *conflict, eRecMenuState nextAction) {
     SetWidthPercent(95);
     this->conflict = conflict;
     totalNumMenuItems = (int)conflict->timerIDs.size();
@@ -240,7 +240,7 @@ cRecMenuTimerConflict::cRecMenuTimerConflict(cTVGuideTimerConflict *conflict) {
                                                   conflict->timeStop,
                                                   conflict->overlapStart,
                                                   conflict->overlapStop));
-    SetFooter(new cRecMenuItemButton(tr("Ignore Conflict"), rmsIgnoreTimerConflict, false, true));
+    SetFooter(new cRecMenuItemButton(tr("Ignore Conflict"), nextAction, false, true));
     int i=0;
     for(std::vector<int>::iterator it = conflict->timerIDs.begin(); it != conflict->timerIDs.end(); it++) {
 #if VDRVERSNUM >= 20301
diff --git a/recmenus.h b/recmenus.h
index 4c9b726..001e78f 100644
--- a/recmenus.h
+++ b/recmenus.h
@@ -79,7 +79,7 @@ private:
     cTVGuideTimerConflict *conflict;

     int totalNumMenuItems;

 public:

-    cRecMenuTimerConflict(cTVGuideTimerConflict *conflict);

+    cRecMenuTimerConflict(cTVGuideTimerConflict *conflict, eRecMenuState nextAction = rmsClose);

     virtual ~cRecMenuTimerConflict(void) {};

     cRecMenuItem *GetMenuItem(int number);

     int GetTotalNumMenuItems(void);

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: {