summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2005-03-20 13:27:01 +0100
committerKlaus Schmidinger <vdr@tvdr.de>2005-03-20 13:27:01 +0100
commitde23bd7cb12284993d56881cfb5f3b7b221dece7 (patch)
tree7d0d575d0a9f97a9ee10759fc057e67b4a0ac0d3
parentfa512884b9327480fcb70749fb26ff960aa626ca (diff)
downloadvdr-de23bd7cb12284993d56881cfb5f3b7b221dece7.tar.gz
vdr-de23bd7cb12284993d56881cfb5f3b7b221dece7.tar.bz2
Added a missing cMutexLock to cRemote::HasKeys()
-rw-r--r--CONTRIBUTORS1
-rw-r--r--HISTORY1
-rw-r--r--remote.c3
3 files changed, 4 insertions, 1 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index fe0ef222..26d52c49 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1281,6 +1281,7 @@ Wolfgang Rohdewald <wolfgang@rohdewald.de>
in cDevice::Shutdown()
for removing some unneeded code and fixing access to unallocated memory in
cEvent::FixEpgBugs()
+ for adding a missing cMutexLock to cRemote::HasKeys()
Chad Flynt <hoochster@sofnet.com>
for suggestions and experiments regarding the buffer reserve in cTransfer
diff --git a/HISTORY b/HISTORY
index c0cfcae3..81c68c05 100644
--- a/HISTORY
+++ b/HISTORY
@@ -3471,3 +3471,4 @@ Video Disk Recorder Revision History
menu entry is a directory (thanks to Steffen Beyer).
- Improved falling back to normal recording if the VPS data hasn't been seen for more
than 30 seconds.
+- Added a missing cMutexLock to cRemote::HasKeys() (thanks to Wolfgang Rohdewald).
diff --git a/remote.c b/remote.c
index 2d382e0b..448d5530 100644
--- a/remote.c
+++ b/remote.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: remote.c 1.41 2004/10/31 14:05:12 kls Exp $
+ * $Id: remote.c 1.42 2005/03/20 13:25:31 kls Exp $
*/
#include "remote.h"
@@ -145,6 +145,7 @@ bool cRemote::Put(const char *Code, bool Repeat, bool Release)
bool cRemote::HasKeys(void)
{
+ cMutexLock MutexLock(&mutex);
return in != out && !(keys[out] & k_Repeat);
}