diff options
| author | qwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2011-02-01 17:04:23 +0000 |
|---|---|---|
| committer | qwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2011-02-01 17:04:23 +0000 |
| commit | 84df92db0a0342bb88d19679c50281ee0511de19 (patch) | |
| tree | ab6f259ce8abc513242ab3b3881d2543da1bd536 /res | |
| parent | eee0ec77e48f2644465ea5209427ea64488c0950 (diff) | |
Merged revisions 305472 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2
................
r305472 | qwell | 2011-02-01 11:02:09 -0600 (Tue, 01 Feb 2011) | 16 lines
Merged revisions 305471 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r305471 | qwell | 2011-02-01 11:00:55 -0600 (Tue, 01 Feb 2011) | 9 lines
Close file descriptor for timing source when a MOH class gets destroyed.
(closes issue #18457)
Reported by: mcallist
Patches:
18457-closetimer.diff uploaded by qwell (license 4)
18457-closetimer_trunk.diff uploaded by qwell (license 4)
Tested by: qwell, loloski
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.8@305473 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'res')
| -rw-r--r-- | res/res_musiconhold.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c index 410021547..45280bf74 100644 --- a/res/res_musiconhold.c +++ b/res/res_musiconhold.c @@ -1589,6 +1589,11 @@ static void moh_class_destructor(void *obj) class->filearray = NULL; } + if (class->timer) { + ast_timer_close(class->timer); + class->timer = NULL; + } + /* Finally, collect the exit status of the monitor thread */ if (tid > 0) { pthread_join(tid, NULL); |