From 236d130b574d7a2559c448d061c64d034e93a94e Mon Sep 17 00:00:00 2001 From: Christian Wieninger Date: Tue, 23 Jun 2009 20:31:56 +0200 Subject: - made some destructors virtual - when creating search timers directly from EPG their default 'use channel' is now the corresponding channel of the event instead of the current channel --- menu_searchedit.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'menu_searchedit.c') diff --git a/menu_searchedit.c b/menu_searchedit.c index e7af17a..84b0e22 100644 --- a/menu_searchedit.c +++ b/menu_searchedit.c @@ -45,7 +45,7 @@ cChannelGroups ChannelGroups; cSearchExtCats SearchExtCats; // --- cMenuEditSearchExt -------------------------------------------------------- -cMenuEditSearchExt::cMenuEditSearchExt(cSearchExt *SearchExt, bool New, bool Template) +cMenuEditSearchExt::cMenuEditSearchExt(cSearchExt *SearchExt, bool New, bool Template, bool FromEPG) :cOsdMenu(tr("Edit search"),32) { templateMode = Template; @@ -104,7 +104,7 @@ cMenuEditSearchExt::cMenuEditSearchExt(cSearchExt *SearchExt, bool New, bool Tem SearchExtTempl = SearchTemplates.Next(SearchExtTempl); } if (SearchTempl) - SearchExt->CopyFromTemplate(SearchTempl); + SearchExt->CopyFromTemplate(SearchTempl, FromEPG); } searchExt = SearchExt; @@ -127,11 +127,11 @@ cMenuEditSearchExt::cMenuEditSearchExt(cSearchExt *SearchExt, bool New, bool Tem channelMin = channelMax = cDevice::CurrentChannel(); channelGroupNr = 0; - if (data.useChannel==1) - { + if (data.channelMin) channelMin = data.channelMin->Number(); + if (data.channelMax) channelMax = data.channelMax->Number(); - } + if (data.useChannel==2) { channelGroupNr = ChannelGroups.GetIndex(data.channelGroup); -- cgit v1.2.3