diff options
author | Klaus Schmidinger <vdr@tvdr.de> | 2017-05-30 11:06:55 +0200 |
---|---|---|
committer | Klaus Schmidinger <vdr@tvdr.de> | 2017-05-30 11:06:55 +0200 |
commit | f97a59597f53e2a207b624ab32f491131253987c (patch) | |
tree | 1447dc381514dd21c2143ce0fdeda40f1775c479 /device.c | |
parent | 6edfcda43a365cfd94ed6649d66a0adcbb965480 (diff) | |
download | vdr-f97a59597f53e2a207b624ab32f491131253987c.tar.gz vdr-f97a59597f53e2a207b624ab32f491131253987c.tar.bz2 |
Now using a separate mutex to fix the race between SVDRP CHAN and cDevice::HasProgramme()
Diffstat (limited to 'device.c')
-rw-r--r-- | device.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -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; } |