dect
/
asterisk
Archived
13
0
Fork 0
Code Releases Activity

Merged revisions 9493,9528 via svnmerge from 

https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r9493 | bweschke | 2006-02-11 00:29:34 -0600 (Sat, 11 Feb 2006) | 3 lines

 kpfleming's fix from r9472 backported to 1.2


........
r9528 | kpfleming | 2006-02-11 09:22:55 -0600 (Sat, 11 Feb 2006) | 2 lines

clean up my mess from thread-starting change

........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@9529 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
kpfleming 2006-02-11 15:27:38 +00:00
parent 24dc28a81f
commit fa4d9273e4
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cdr.c
View File

@ -1120,7 +1120,6 @@ static int do_reload(void)
int was_enabled;
int was_batchmode;
int res=0;
pthread_attr_t attr;
ast_mutex_lock(&cdr_batch_lock);
@ -1181,7 +1180,7 @@ static int do_reload(void)
if it does not exist */
if (enabled && batchmode && (!was_enabled || !was_batchmode) && (cdr_thread == AST_PTHREADT_NULL)) {
ast_cond_init(&cdr_pending_cond, NULL);
if (ast_pthread_create(&cdr_thread, &attr, do_cdr, NULL) < 0) {
if (ast_pthread_create(&cdr_thread, NULL, do_cdr, NULL) < 0) {
ast_log(LOG_ERROR, "Unable to start CDR thread.\n");
ast_sched_del(sched, cdr_sched);
} else {