diff options
| author | Christian Wieninger <cwieninger (at) gmx (dot) de> | 2009-06-23 20:31:56 +0200 |
|---|---|---|
| committer | Christian Wieninger <cwieninger (at) gmx (dot) de> | 2009-06-23 20:31:56 +0200 |
| commit | 236d130b574d7a2559c448d061c64d034e93a94e (patch) | |
| tree | b1c389148ed3dc2829a4f8a1463b596e91168571 /menu_searchedit.c | |
| parent | 29fb44c898ff29e7f195e3744bd081c5db2548be (diff) | |
| download | vdr-plugin-epgsearch-236d130b574d7a2559c448d061c64d034e93a94e.tar.gz vdr-plugin-epgsearch-236d130b574d7a2559c448d061c64d034e93a94e.tar.bz2 | |
- 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
Diffstat (limited to 'menu_searchedit.c')
| -rw-r--r-- | menu_searchedit.c | 10 |
1 files changed, 5 insertions, 5 deletions
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); |