From a20bd2a42ff8096e8525509f09e284f336590cff Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Sat, 13 Oct 2007 11:17:56 +0200 Subject: [PATCH] Only creating a new cDvbOsdProvider in cDvbDevice::MakePrimaryDevice() if 'On' is true --- HISTORY | 2 ++ dvbdevice.c | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/HISTORY b/HISTORY index c788e766..9c10dc94 100644 --- a/HISTORY +++ b/HISTORY @@ -5457,3 +5457,5 @@ Video Disk Recorder Revision History by Reinhard Nissl). - Fixed a crash when pressing Left while at the first character of a cMenuEditStrItem (thanks to Christian Wieninger). +- Only creating a new cDvbOsdProvider in cDvbDevice::MakePrimaryDevice() if 'On' + is true (i.e. this device is being made the primary device). diff --git a/dvbdevice.c b/dvbdevice.c index 7d1a5c8c..5864f49e 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.165 2007/08/17 13:37:56 kls Exp $ + * $Id: dvbdevice.c 1.166 2007/10/13 11:15:50 kls Exp $ */ #include "dvbdevice.h" @@ -483,7 +483,7 @@ bool cDvbDevice::Initialize(void) void cDvbDevice::MakePrimaryDevice(bool On) { - if (HasDecoder()) + if (On && HasDecoder()) new cDvbOsdProvider(fd_osd); }