From 6e6e468148e231156be0cccf1ecd3f6eab5b5970 Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Thu, 22 Aug 2013 12:02:12 +0200 Subject: cDevice::IsPrimaryDevice() now also checks whether the primary device actually has a decoder and returns false otherwise --- device.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'device.h') diff --git a/device.h b/device.h index fd010d41..6ba5c38d 100644 --- a/device.h +++ b/device.h @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: device.h 2.47 2013/02/16 15:20:01 kls Exp $ + * $Id: device.h 2.47.1.1 2013/08/22 12:01:48 kls Exp $ */ #ifndef __DEVICE_H @@ -196,7 +196,7 @@ protected: ///< A derived class must call the MakePrimaryDevice() function of its ///< base class. public: - bool IsPrimaryDevice(void) const { return this == primaryDevice; } + bool IsPrimaryDevice(void) const { return this == primaryDevice && HasDecoder(); } int CardIndex(void) const { return cardIndex; } ///< Returns the card index of this device (0 ... MAXDEVICES - 1). int DeviceNumber(void) const; -- cgit v1.2.3