From 2ce1bf31d31c852eb0aca1e777df122f7a66a9b6 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <vdr@tvdr.de>
Date: Sat, 2 Feb 2002 11:59:10 +0100
Subject: [PATCH] Removed the EPG bugfix for 'Title / Subtitle' cleanup

---
 HISTORY |  2 ++
 eit.c   | 16 +---------------
 2 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/HISTORY b/HISTORY
index d89e3a5f..9ae82d46 100644
--- a/HISTORY
+++ b/HISTORY
@@ -940,3 +940,5 @@ Video Disk Recorder Revision History
   month has less than 31 days.
 - Added a description of the sort order of individual episodes in the
   recordings menu to the MANUAL.
+- Removed the EPG bugfix for "Title / Subtitle" cleanup. Apparently Pro-7 has
+  finally stopped this nasty habit.
diff --git a/eit.c b/eit.c
index ed757d2c..d3943a8c 100644
--- a/eit.c
+++ b/eit.c
@@ -16,7 +16,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- * $Id: eit.c 1.31 2002/01/13 16:14:31 kls Exp $
+ * $Id: eit.c 1.32 2002/02/02 11:57:57 kls Exp $
  ***************************************************************************/
 
 #include "eit.h"
@@ -367,20 +367,6 @@ void cEventInfo::FixEpgBugs(void)
   // EPG data. Let's fix their bugs as good as we can:
   if (pTitle) {
 
-     // Pro7 preceeds the Subtitle with the Title:
-     //
-     // Title
-     // Title / Subtitle
-     //
-     if (pSubtitle && strstr(pSubtitle, pTitle) == pSubtitle) {
-        char *p = pSubtitle + strlen(pTitle);
-        const char *delim = " / ";
-        if (strstr(p, delim) == p) {
-           p += strlen(delim);
-           memmove(pSubtitle, p, strlen(p) + 1);
-           }
-        }
-
      // VOX and VIVA put the Subtitle in quotes and use either the Subtitle
      // or the Extended Description field, depending on how long the string is:
      //