From fc9c149eb96f7a949c2f183693e4df15abe8dc4b Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Tue, 26 Aug 2003 18:00:00 +0200
Subject: Version 1.2.4 (not officially released) - Fixed 'runvdr' to stay in
 the loop only if VDR returns an exit status of '1'. - Completed the Finnish
 OSD texts (thanks to Rolf Ahrenberg). - Empty values in setup.conf are no
 longer treated as an error (thanks to Andreas   Kool for reporting this one).
 - Added a note about the config files of plugins to INSTALL (thanks to Thomas
   Keil). - VDR now continues to start up, even if there is an error in
 setup.conf. - Fixed a bug in resetting OSD color palettes (thanks to Torsten
 Herz). - Fixed starting a recording on the primary device if there is a
 replay session   active (thanks to Javier Marcet for reporting this one). -
 Avoiding an unnecessary stop of an ongoing Transfer Mode when starting a  
 recording on the primary device.

---
 dvbdevice.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'dvbdevice.c')

diff --git a/dvbdevice.c b/dvbdevice.c
index 34d5582..fe6c951 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 1.61 2003/08/15 13:03:41 kls Exp $
+ * $Id: dvbdevice.c 1.62 2003/08/24 14:23:12 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -613,13 +613,12 @@ bool cDvbDevice::ProvidesChannel(const cChannel *Channel, int Priority, bool *Ne
 {
   bool result = false;
   bool hasPriority = Priority < 0 || Priority > this->Priority();
-  bool needsDetachReceivers = true;
+  bool needsDetachReceivers = false;
 
   if (ProvidesSource(Channel->Source()) && ProvidesCa(Channel->Ca())) {
      result = hasPriority;
      if (Receiving()) {
         if (dvbTuner->IsTunedTo(Channel)) {
-           needsDetachReceivers = false;
            if (!HasPid(Channel->Vpid())) {
 #ifdef DO_MULTIPLE_RECORDINGS
               if (Channel->Ca() > CACONFBASE)
@@ -636,6 +635,8 @@ bool cDvbDevice::ProvidesChannel(const cChannel *Channel, int Priority, bool *Ne
            else
               result = !IsPrimaryDevice() || Priority >= Setup.PrimaryLimit;
            }
+        else
+           needsDetachReceivers = true;
         }
      }
   if (NeedsDetachReceivers)
-- 
cgit v1.2.3