summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--HISTORY2
-rw-r--r--thread.c11
2 files changed, 8 insertions, 5 deletions
diff --git a/HISTORY b/HISTORY
index e4b6370d..b4265046 100644
--- a/HISTORY
+++ b/HISTORY
@@ -759,7 +759,7 @@ Video Disk Recorder Revision History
audio output volume.
- New version of the 'epg2timers' tool (thanks to Carsten Koch).
-2001-09-21: Version 0.96
+2001-09-23: Version 0.96
- Made VDR compile with libdvdread-0.9.1 (thanks to Andreas Schultz).
Note that you now _need_ version 0.9.1 of libdvdread to compile VDR with
diff --git a/thread.c b/thread.c
index ec66440e..f4ba76a1 100644
--- a/thread.c
+++ b/thread.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: thread.c 1.12 2001/09/15 13:00:58 kls Exp $
+ * $Id: thread.c 1.13 2001/09/23 14:04:35 kls Exp $
*/
#include "thread.h"
@@ -67,16 +67,19 @@ cMutex::~cMutex()
void cMutex::Lock(void)
{
- if (getpid() != lockingPid || !locked)
+ if (getpid() != lockingPid || !locked) {
pthread_mutex_lock(&mutex);
- lockingPid = getpid();
+ lockingPid = getpid();
+ }
locked++;
}
void cMutex::Unlock(void)
{
- if (!--locked)
+ if (!--locked) {
+ lockingPid = 0;
pthread_mutex_unlock(&mutex);
+ }
}
// --- cThread ---------------------------------------------------------------