Merge branch 'experimental' into epg_short_text

2 files changed, 10 insertions, 2 deletions

diff --git a/eit2.c b/eit2.c
index 87064c5..3980dba 100644
--- a/eit2.c
+++ b/eit2.c
@@ -427,8 +427,10 @@ void cEIT2::ProcessEventDescriptors(bool ExternalData, int Source,
   //      LogD(2, prep("ID: %d Title: %s Time: %d Tid: 0x%x"), pEvent->EventID(), pEvent->Title(), pEvent->StartTime(), pEvent->TableID());
   //    }
 
-  //      if (!HasExternalData)
-  pEvent->FixEpgBugs ();
+  //FixEpgBugs removes newlines from description which is not wanted especially for DISH/BEV
+  if (Format != DISH_BEV)
+    pEvent->FixEpgBugs();
+
   if (LinkChannels)
     channel->SetLinkChannels (LinkChannels);
 }
diff --git a/epghandler.c b/epghandler.c
index 5bfabf1..1753ab7 100644
--- a/epghandler.c
+++ b/epghandler.c
@@ -10,9 +10,12 @@
 #include "log.h"
 #include "equivhandler.h"
 #include "eit2.h"
+#include "util.h"
 #include <vdr/sources.h>
 #include <libsi/si.h>
 
+using namespace util;
+
 cEEpgHandler::cEEpgHandler() {
   LogD(4, prep("cEEpgHandler()"));
   equivHandler = new cEquivHandler();
@@ -30,6 +33,9 @@ bool cEEpgHandler::HandleEitEvent(cSchedule* Schedule,
   //DISH NID 0x1001 to 0x100B BEV 0x100 and 0x101
   int nid = Schedule->ChannelID().Nid();
   if ((nid >= 0x1001 && nid <= 0x100B) || nid == 0x101 || nid == 0x100) {
+    //Set the Format for Eit events so that the new lines are not erased with FixEpgBugs
+    if (Format != DISH_BEV) Format = DISH_BEV;
+
     SI::cEIT2 eit2(Schedule);
     eit2.ProcessEitEvent(Schedule, EitEvent, TableID, Version);
     return true;