- 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

1 files changed, 15 insertions, 11 deletions

diff --git a/epgsearchext.c b/epgsearchext.c
index 79bfd70..a2b30a2 100644
--- a/epgsearchext.c
+++ b/epgsearchext.c
@@ -163,13 +163,14 @@ cSearchExt& cSearchExt::operator= (const cSearchExt &SearchExt)
    return *this;
 }
 
-void cSearchExt::CopyFromTemplate(const cSearchExt* templ)
+  void cSearchExt::CopyFromTemplate(const cSearchExt* templ, bool ignoreChannelSettings)
 {
    options = templ->options;
    useTime = templ->useTime;
    startTime = templ->startTime;
    stopTime = templ->stopTime;
-   useChannel = templ->useChannel;
+   if (!ignoreChannelSettings)
+     useChannel = templ->useChannel;
    useCase = templ->useCase;
    mode = templ->mode;
    useTitle = templ->useTitle;
@@ -202,15 +203,18 @@ void cSearchExt::CopyFromTemplate(const cSearchExt* templ)
       index++;
    }
   
-   channelMin = templ->channelMin;
-   channelMax = templ->channelMax;
-   if (channelGroup)
-   {
-      free(channelGroup);
-      channelGroup = NULL;
-   }
-   if (templ->channelGroup)
-      channelGroup = strdup(templ->channelGroup);
+   if (!ignoreChannelSettings)
+     {
+       channelMin = templ->channelMin;
+       channelMax = templ->channelMax;
+       if (channelGroup)
+	 {
+	   free(channelGroup);
+	   channelGroup = NULL;
+	 }
+       if (templ->channelGroup)
+	 channelGroup = strdup(templ->channelGroup);
+     }
    avoidRepeats = templ->avoidRepeats;
    compareTitle = templ->compareTitle;
    compareSubtitle = templ->compareSubtitle;