frodovdr
/
vdr-plugin-tvguide
mirror of https://projects.vdr-developer.org/git/vdr-plugin-tvguide.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Eliminate all currentMenuItems

This commit is contained in:
kamel5 2019-06-17 14:29:42 +02:00
parent ef4ff3d115
commit 507ecc60f6
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
recmenus.c
View File

@ -759,7 +759,6 @@ cRecMenuSearchTimerEdit::~cRecMenuSearchTimerEdit(void) {
delete *it;
}
mainMenuItems.clear();
currentMenuItems.clear();
}
int cRecMenuSearchTimerEdit::SplitChannelGroups(std::vector<std::string> *channelGroups, std::vector<std::string> *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;
}

1
recmenus.h
View File

@ -217,7 +217,6 @@ private:
std::vector<std::string> delModes;
std::vector<std::string> channelgroups;
std::vector<cRecMenuItem*> mainMenuItems;
std::vector<cRecMenuItem*> currentMenuItems;
bool init;
int numMenuItems;
int useChannelPos;