summaryrefslogtreecommitdiff
path: root/device.h
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2013-08-22 12:00:03 +0200
committerKlaus Schmidinger <vdr@tvdr.de>2013-08-22 12:00:03 +0200
commit17b12a32b049ab8979c56572c9c5ae9b23227e68 (patch)
tree54e83a0e857658009c1729383fb1fc01d006fce6 /device.h
parent99321b371acd247bb41737df50af6f4084472098 (diff)
downloadvdr-17b12a32b049ab8979c56572c9c5ae9b23227e68.tar.gz
vdr-17b12a32b049ab8979c56572c9c5ae9b23227e68.tar.bz2
cDevice::IsPrimaryDevice() now also checks whether the primary device actually has a decoder and returns false otherwise
Diffstat (limited to 'device.h')
-rw-r--r--device.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/device.h b/device.h
index 5c334490..d4d50d40 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 3.1 2013/06/01 11:35:23 kls Exp $
+ * $Id: device.h 3.2 2013/08/22 11:57:34 kls Exp $
*/
#ifndef __DEVICE_H
@@ -197,7 +197,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;