Fixed determining the priority of the primary device in case it is neither replaying nor receiving a live channel

2 files changed, 4 insertions, 2 deletions

diff --git a/HISTORY b/HISTORY
index 4238d3f7..d114f1eb 100644
--- a/HISTORY
+++ b/HISTORY
@@ -7629,3 +7629,5 @@ Video Disk Recorder Revision History
 - Added '-p' to the cp command in the install-conf target of the Makefile (thanks to
   Ville Skyttä).
 - Added missing 'const' to cDevice::HasProgramme() and cDevice::HasLock().
+- Fixed determining the priority of the primary device in case it is neither replaying
+  nor receiving a live channel.
diff --git a/device.c b/device.c
index 31f7aded..ca897b0f 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 2.72 2013/02/16 13:05:06 kls Exp $
+ * $Id: device.c 2.73 2013/02/16 14:39:30 kls Exp $
  */
 
 #include "device.h"
@@ -1537,7 +1537,7 @@ int cDevice::PlayTs(const uchar *Data, int Length, bool VideoOnly)
 int cDevice::Priority(void) const
 {
   int priority = IDLEPRIORITY;
-  if (IsPrimaryDevice() && !Replaying() && ActualDevice() == PrimaryDevice())
+  if (IsPrimaryDevice() && !Replaying() && HasProgramme())
      priority = TRANSFERPRIORITY; // we use the same value here, no matter whether it's actual Transfer Mode or real live viewing
   cMutexLock MutexLock(&mutexReceiver);
   for (int i = 0; i < MAXRECEIVERS; i++) {