summaryrefslogtreecommitdiff
path: root/xine_input_vdr.c
diff options
context:
space:
mode:
authorphintuka <phintuka>2006-08-26 18:23:16 +0000
committerphintuka <phintuka>2006-08-26 18:23:16 +0000
commitf838045bbb61c3a17924da07179fb3a7d0cae430 (patch)
tree1140fafc038aac3c3ce0e78a1dd824351f3299fa /xine_input_vdr.c
parent772ef6222ee819ecb4398737343bd859e2df8edc (diff)
downloadxineliboutput-f838045bbb61c3a17924da07179fb3a7d0cae430.tar.gz
xineliboutput-f838045bbb61c3a17924da07179fb3a7d0cae430.tar.bz2
cancel may leave locks unlocked
Diffstat (limited to 'xine_input_vdr.c')
-rw-r--r--xine_input_vdr.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/xine_input_vdr.c b/xine_input_vdr.c
index 28e2bd60..0ff4287b 100644
--- a/xine_input_vdr.c
+++ b/xine_input_vdr.c
@@ -4,7 +4,7 @@
* See the main source file 'xineliboutput.c' for copyright information and
* how to reach the author.
*
- * $Id: xine_input_vdr.c,v 1.36 2006-08-26 18:10:34 phintuka Exp $
+ * $Id: xine_input_vdr.c,v 1.37 2006-08-26 18:23:16 phintuka Exp $
*
*/
@@ -4203,10 +4203,10 @@ static void vdr_plugin_dispose (input_plugin_t *this_gen)
if(!local && this->threads_initialized) {
void *p;
LOGDBG("Cancel control thread ...");
- pthread_cancel(this->control_thread);
+ /*pthread_cancel(this->control_thread);*/
pthread_join (this->control_thread, &p);
LOGDBG("Cancel data thread ...");
- pthread_cancel(this->data_thread);
+ /*pthread_cancel(this->data_thread);*/
pthread_join (this->data_thread, &p);
LOGDBG("Threads joined");
}