diff options
| -rw-r--r-- | CONTRIBUTORS | 1 | ||||
| -rw-r--r-- | HISTORY | 2 | ||||
| -rw-r--r-- | thread.c | 4 | 
3 files changed, 5 insertions, 2 deletions
| diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 2d9708cd..4bcef409 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -1309,6 +1309,7 @@ Marco Schlüßler <marco@lordzodiac.de>   for adding an 'Id' parameter to cDevice::PlayAudio() to allow plugins to easier   process the audio data   for improving OSD area handling in cDvbSpuDecoder + for suggesting to log the description (if present) in case a thread is canceled  Jürgen Schmitz <j.schmitz@web.de>   for reporting a bug in displaying the current channel when switching via the SVDRP @@ -4327,3 +4327,5 @@ Video Disk Recorder Revision History    symbolic links, which might indicate a recursive link loop (based on a patch    from Helmut Auer).  - Improved OSD area handling in cDvbSpuDecoder (thanks to Marco Schlüßler). +- Now logging the description (if present) in case a thread is canceled (suggested +  by Marco Schlüßler). @@ -4,7 +4,7 @@   * See the main source file 'vdr.c' for copyright information and   * how to reach the author.   * - * $Id: thread.c 1.52 2006/01/28 11:34:35 kls Exp $ + * $Id: thread.c 1.53 2006/02/12 12:24:39 kls Exp $   */  #include "thread.h" @@ -300,7 +300,7 @@ void cThread::Cancel(int WaitSeconds)                 return;              cCondWait::SleepMs(10);              } -        esyslog("ERROR: thread %d won't end (waited %d seconds) - canceling it...", childThreadId, WaitSeconds); +        esyslog("ERROR: %s thread %d won't end (waited %d seconds) - canceling it...", description ? description : "", childThreadId, WaitSeconds);          }       pthread_cancel(childTid);       childTid = 0; | 
