From 435ee3981203577709ffd41057f0e120615871a1 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <vdr@tvdr.de>
Date: Sun, 18 May 2003 12:46:39 +0200
Subject: [PATCH] Fixed setting the locking pid after a timed wait

---
 CONTRIBUTORS | 1 +
 HISTORY      | 3 ++-
 thread.c     | 3 ++-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 8c531f00..b2cd6a81 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -204,6 +204,7 @@ Andreas Schultz <aschultz@warp10.net>
  for suggesting to separate the startup of a plugin into an "early" and a "late" phase
  for changing C++ style comments in libdtv into C style to avoid warnings in gcc 3.x
  for implementing the TerrestrialDeliverySystemDescriptor in libdtv
+ for fixing setting the locking pid after a timed wait
 
 Aaron Holtzman
  for writing 'ac3dec'
diff --git a/HISTORY b/HISTORY
index 64c69793..d5979040 100644
--- a/HISTORY
+++ b/HISTORY
@@ -2143,7 +2143,7 @@ Video Disk Recorder Revision History
 - Changed C++ style comments in libdtv into C style to avoid warnings in gcc 3.x
   (thanks to Andreas Schultz).
 
-2003-05-16: Version 1.1.32
+2003-05-18: Version 1.1.32
 
 - Removed a faulty parameter initialization in menu.c (thanks to Lauri Tischler for
   reporting this one).
@@ -2163,3 +2163,4 @@ Video Disk Recorder Revision History
   cRecorder to avoid problems with cReceivers that want to receive from PIDs
   that are currently not transmitting (thanks to Marcel Wiesweg for reporting
   this one).
+- Fixed setting the locking pid after a timed wait (thanks to Andreas Schultz).
diff --git a/thread.c b/thread.c
index 07c8f79a..5fbcfd88 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.24 2003/05/03 14:03:32 kls Exp $
+ * $Id: thread.c 1.25 2003/05/18 12:45:13 kls Exp $
  */
 
 #include "thread.h"
@@ -61,6 +61,7 @@ bool cCondVar::TimedWait(cMutex &Mutex, int TimeoutMs)
         if (pthread_cond_timedwait(&cond, &Mutex.mutex, &abstime) == ETIMEDOUT)
            r = false;
         Mutex.locked = locked;
+        Mutex.lockingPid = getpid();
         }
      }
   return r;