From 375d25627de34f4a5a1a032f032b8c6a1be2a2c0 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <vdr@tvdr.de>
Date: Sat, 28 Nov 2020 21:45:05 +0100
Subject: Fixed generating the HashId in cEIT::cEIT()

---
 CONTRIBUTORS | 1 +
 HISTORY      | 3 ++-
 eit.c        | 4 ++--
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 9e702288..4c6380ae 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -3634,6 +3634,7 @@ Helmut Binder <cco@aon.at>
  for initializing the status variable in cDvbTuner::GetFrontendStatus() and
  cDvbTuner::GetSignalStats() to avoid problems with drivers that don't do this
  for fixing "read incomplete section" errors
+ for fixing generating the HashId in cEIT::cEIT()
 
 Ulrich Eckhardt <uli@uli-eckhardt.de>
  for reporting a problem with shutdown after user inactivity in case a plugin is
diff --git a/HISTORY b/HISTORY
index 16d78aaf..b0c3aa8d 100644
--- a/HISTORY
+++ b/HISTORY
@@ -9536,7 +9536,7 @@ Video Disk Recorder Revision History
   cDvbTuner::GetSignalStats() to avoid problems with drivers that don't do this
   (thanks to Helmut Binder).
 
-2020-11-24:
+2020-11-28:
 
 - Fixed multiple recording entries in case a recording is started during the initial
   reading of the video directory (reported by Claus Muus).
@@ -9547,3 +9547,4 @@ Video Disk Recorder Revision History
 - Fixed parsing the '-l' command line option (reported by Harald Milz).
 - Fixed possible compilation errors with libjpeg (thanks to Bernd Kuhls).
 - Fixed "read incomplete section" errors (thanks to Helmut Binder).
+- Fixed generating the HashId in cEIT::cEIT() (thanks to Helmut Binder).
diff --git a/eit.c b/eit.c
index 38662a56..9c3f6f61 100644
--- a/eit.c
+++ b/eit.c
@@ -8,7 +8,7 @@
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  * Adapted to 'libsi' for VDR 1.3.0 by Marcel Wiesweg <marcel.wiesweg@gmx.de>.
  *
- * $Id: eit.c 4.10 2020/06/23 09:27:09 kls Exp $
+ * $Id: eit.c 4.11 2020/11/28 21:45:05 kls Exp $
  */
 
 #include "eit.h"
@@ -34,7 +34,7 @@ cEIT::cEIT(cSectionSyncerHash &SectionSyncerHash, int Source, u_char Tid, const
 {
   if (!CheckCRCAndParse())
      return;
-  int HashId = Tid * getServiceId();
+  int HashId = Tid + (getServiceId() << 8);
   cSectionSyncerEntry *SectionSyncerEntry = SectionSyncerHash.Get(HashId);
   if (!SectionSyncerEntry) {
      SectionSyncerEntry = new cSectionSyncerEntry;
-- 
cgit v1.2.3