From 2543f2c486e4abb6b7d273826308ce7429b5b61a Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <vdr@tvdr.de>
Date: Sun, 14 Jul 2024 15:41:01 +0200
Subject: [PATCH] Added the lines from 'Fixed a timeout in cDvbDevice while
 tuning after the frontend has been reopened' to cDvbTuner::ProvidesFrontend()

---
 CONTRIBUTORS | 2 ++
 HISTORY      | 4 +++-
 dvbdevice.c  | 8 +++++---
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 14a3c250..b1539995 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -2576,6 +2576,8 @@ Markus Ehrnsperger <markus.ehrnsperger@googlemail.com>
  for suggesting to add 'lnbPowerTurnedOn = false' to cDvbTuner::ProvidesFrontend()
  for reporting a crash in strreplace() for multiple replacements with strings of
  different lengths
+ for suggesting to add the lines from 'Fixed a timeout in cDvbDevice while tuning after
+ the frontend has been reopened' to cDvbTuner::ProvidesFrontend()
 
 Werner Färber <w.faerber@gmx.de>
  for reporting a bug in handling the cPluginManager::Active() result when pressing
diff --git a/HISTORY b/HISTORY
index 54566035..04e6c059 100644
--- a/HISTORY
+++ b/HISTORY
@@ -9940,7 +9940,7 @@ Video Disk Recorder Revision History
 - Added 'lnbPowerTurnedOn = false' to cDvbTuner::ProvidesFrontend() (suggested by
   Markus Ehrnsperger).
 
-2024-07-13:
+2024-07-14:
 
 - Fixed a crash in strreplace() for multiple replacements with strings of different
   lengths (reported by Markus Ehrnsperger).
@@ -9949,3 +9949,5 @@ Video Disk Recorder Revision History
 - Fixed setting the editable width in the LCARS skin (reported by Matthias Senzel).
 - Fixed restarting the EPG scan and keeping the frequency of calls to
   Device->SetPowerSaveIfUnused() low.
+- Added the lines from 'Fixed a timeout in cDvbDevice while tuning after the frontend
+  has been reopened' to cDvbTuner::ProvidesFrontend() (suggested by Markus Ehrnsperger).
diff --git a/dvbdevice.c b/dvbdevice.c
index f1d911e4..ff399b29 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.c 5.6 2024/07/13 12:34:42 kls Exp $
+ * $Id: dvbdevice.c 5.7 2024/07/14 15:41:01 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -549,9 +549,9 @@ private:
   mutable uint32_t lastUncDelta;
   mutable time_t lastUncChange;
   cChannel channel;
-  const cDiseqc *lastDiseqc;
+  mutable const cDiseqc *lastDiseqc;
   int diseqcOffset;
-  int lastSource;
+  mutable int lastSource;
   cPositioner *positioner;
   const cScr *scr;
   mutable bool lnbPowerTurnedOn;
@@ -697,6 +697,8 @@ bool cDvbTuner::ProvidesFrontend(const cChannel *Channel, bool Activate) const
             fd_frontend = dvbFrontend->Open();
             frontend = i;
             dsyslog("using frontend %d/%d", adapter, frontend);
+            lastDiseqc = NULL;
+            lastSource = 0;
             lastUncValue = 0;
             lastUncDelta = 0;
             lastUncChange = 0;