From 507ecc60f661d9dbba0c1f582329b20e840106e7 Mon Sep 17 00:00:00 2001 From: kamel5 Date: Mon, 17 Jun 2019 14:29:42 +0200 Subject: [PATCH] Eliminate all currentMenuItems --- recmenus.c | 5 ++--- recmenus.h | 1 - 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/recmenus.c b/recmenus.c index 4767a3f..21949bc 100644 --- a/recmenus.c +++ b/recmenus.c @@ -759,7 +759,6 @@ cRecMenuSearchTimerEdit::~cRecMenuSearchTimerEdit(void) { delete *it; } mainMenuItems.clear(); - currentMenuItems.clear(); } int cRecMenuSearchTimerEdit::SplitChannelGroups(std::vector *channelGroups, std::vector *channelgroups) { @@ -852,7 +851,7 @@ void cRecMenuSearchTimerEdit::CreateMenuItems(void) { int start = GetStartIndex(); for (int i = start; i < numMenuItems; i++) { - if (!AddMenuItemInitial(currentMenuItems[i])) { + if (!AddMenuItemInitial(mainMenuItems[i])) { break; } } @@ -923,7 +922,7 @@ int cRecMenuSearchTimerEdit::GetTotalNumMenuItems(void) { cRecMenuItem *cRecMenuSearchTimerEdit::GetMenuItem(int number) { if ((number > -1) && (number < numMenuItems)) { - return currentMenuItems[number]; + return mainMenuItems[number]; } return NULL; } diff --git a/recmenus.h b/recmenus.h index d4e2b49..84c756f 100644 --- a/recmenus.h +++ b/recmenus.h @@ -217,7 +217,6 @@ private: std::vector delModes; std::vector channelgroups; std::vector mainMenuItems; - std::vector currentMenuItems; bool init; int numMenuItems; int useChannelPos;