projects
/
asterisk/asterisk.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
92f261c
)
fix monitor thread. Bug #726
author
Jeremy McNamara
<jj@nufone.net>
Mon, 12 Jan 2004 06:10:54 +0000
(06:10 +0000)
committer
Jeremy McNamara
<jj@nufone.net>
Mon, 12 Jan 2004 06:10:54 +0000
(06:10 +0000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@1976
65c4cc65
-6c06-0410-ace0-
fbb531ad65f3
channels/chan_zap.c
patch
|
blob
|
history
diff --git
a/channels/chan_zap.c
b/channels/chan_zap.c
index
56ccea1
..
80e4fec
100755
(executable)
--- a/
channels/chan_zap.c
+++ b/
channels/chan_zap.c
@@
-7048,7
+7048,7
@@
static int __unload_module(void)
return -1;
}
if (!ast_mutex_lock(&monlock)) {
return -1;
}
if (!ast_mutex_lock(&monlock)) {
- if (monitor_thread) {
+ if (monitor_thread && (monitor_thread != -2)) {
pthread_cancel(monitor_thread);
pthread_kill(monitor_thread, SIGURG);
pthread_join(monitor_thread, NULL);
pthread_cancel(monitor_thread);
pthread_kill(monitor_thread, SIGURG);
pthread_join(monitor_thread, NULL);