From f97a59597f53e2a207b624ab32f491131253987c Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Tue, 30 May 2017 11:06:55 +0200 Subject: Now using a separate mutex to fix the race between SVDRP CHAN and cDevice::HasProgramme() --- device.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'device.c') diff --git a/device.c b/device.c index 7c1c74b1..3c676922 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 4.22 2017/05/18 09:27:55 kls Exp $ + * $Id: device.c 4.23 2017/05/30 11:06:11 kls Exp $ */ #include "device.h" @@ -834,7 +834,7 @@ bool cDevice::SwitchChannel(int Direction) eSetChannelResult cDevice::SetChannel(const cChannel *Channel, bool LiveView) { - cMutexLock MutexLock(&mutexReceiver); // to avoid a race between SVDRP CHAN and HasProgramme() + cMutexLock MutexLock(&mutexChannel); // to avoid a race between SVDRP CHAN and HasProgramme() cStatus::MsgChannelSwitch(this, 0, LiveView); if (LiveView) { @@ -947,7 +947,7 @@ bool cDevice::HasLock(int TimeoutMs) const bool cDevice::HasProgramme(void) const { - cMutexLock MutexLock(&mutexReceiver); // to avoid a race between SVDRP CHAN and HasProgramme() + cMutexLock MutexLock(&mutexChannel); // to avoid a race between SVDRP CHAN and HasProgramme() return Replaying() || pidHandles[ptAudio].pid || pidHandles[ptVideo].pid; } -- cgit v1.2.3