summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2000-10-08 16:49:41 +0200
committerKlaus Schmidinger <vdr@tvdr.de>2000-10-08 16:49:41 +0200
commitff109a90a6b9bede362e8eda90fb0a452a88b6fb (patch)
treeb669c1e574a6d29bc36187b417dfa34d6f3bee4f
parenta36ff983f5f5304449185cf26e2275c41370d036 (diff)
downloadvdr-ff109a90a6b9bede362e8eda90fb0a452a88b6fb.tar.gz
vdr-ff109a90a6b9bede362e8eda90fb0a452a88b6fb.tar.bz2
Stopping remote control thread at end
-rw-r--r--remote.c4
-rw-r--r--thread.c4
2 files changed, 5 insertions, 3 deletions
diff --git a/remote.c b/remote.c
index 87c70923..f60d7685 100644
--- a/remote.c
+++ b/remote.c
@@ -6,7 +6,7 @@
*
* Ported to LIRC by Carsten Koch <Carsten.Koch@icem.de> 2000-06-16.
*
- * $Id: remote.c 1.17 2000/10/08 11:39:11 kls Exp $
+ * $Id: remote.c 1.18 2000/10/08 16:49:41 kls Exp $
*/
#include "remote.h"
@@ -115,6 +115,7 @@ cRcIoRCU::cRcIoRCU(char *DeviceName)
cRcIoRCU::~cRcIoRCU()
{
+ Stop();
}
void cRcIoRCU::Action(void)
@@ -419,6 +420,7 @@ cRcIoLIRC::cRcIoLIRC(char *DeviceName)
cRcIoLIRC::~cRcIoLIRC()
{
+ Stop();
}
void cRcIoLIRC::Action(void)
diff --git a/thread.c b/thread.c
index 7e3ee939..7304e682 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.1 2000/10/07 17:31:39 kls Exp $
+ * $Id: thread.c 1.2 2000/10/08 16:45:50 kls Exp $
*/
#include "thread.h"
@@ -58,7 +58,7 @@ bool cThread::Start(void)
void cThread::Stop(void)
{
- pthread_exit(NULL);
+ pthread_cancel(thread);
}
bool cThread::Lock(void)