fix table ID initialization

1 files changed, 4 insertions, 1 deletions

diff --git a/eepg.c b/eepg.c
index e243287..354471c 100644
--- a/eepg.c
+++ b/eepg.c
@@ -2151,6 +2151,7 @@ int cFilterEEPG::GetTitlesMHW2 (const u_char * Data, int Length)
         CleanString (T->Text);
         Pos += Len + 8; // Sub Theme starts here
         T->ThemeId = ((Data[7] & 0x3f) << 6) | (Data[Pos] & 0x3f);
+        T->TableId = DEFAULT_TABLE_ID; //TODO locate the actual table id
         T->EventId = (Data[Pos + 1] << 8) | Data[Pos + 2];
         T->SummaryAvailable = (T->EventId != 0xFFFF);
         LogI(3, prep("EventId %04x Titlenr %d:SummAv:%x,Name:%s."), T->EventId,
@@ -2476,6 +2477,7 @@ int cFilterEEPG::GetTitlesSKYBOX (const u_char * Data, int Length)
           T->StartTime = ((MjdTime - 40587) * 86400) + ((Data[p + 2] << 9) | (Data[p + 3] << 1));
           T->Duration = ((Data[p + 4] << 9) | (Data[p + 5] << 1));
           T->ThemeId = Data[p + 6];
+          T->TableId = DEFAULT_TABLE_ID; //TODO locate the actual table id
           //TODO Data[p + 7] is Quality value add it to description
           //int quality = Data[p + 7];
           switch (Data[p + 8] & 0x0F) {
@@ -2974,7 +2976,8 @@ cEIT2::cEIT2 (cSchedules * Schedules, int Source, u_char Tid, const u_char * Dat
       }
       // If the new event has a higher table ID, let's skip it.
       // The lower the table ID, the more "current" the information.
-      else if (Tid > pEvent->TableID ())
+      // if the Table ID is DEFAULT_TABLE_ID it is most probably EEPG event so we can overwrite
+      else if (Tid > pEvent->TableID() && pEvent->TableID () != DEFAULT_TABLE_ID)
         continue;
       // If the new event comes from the same table and has the same version number
       // as the existing one, let's skip it to avoid unnecessary work.