From: Jason Parker <jparker@digium.com>
Date: Tue, 1 Feb 2011 17:04:23 +0000 (+0000)
Subject: Merged revisions 305472 via svnmerge from
X-Git-Tag: 1.8.4-rc1~53
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=97bbc8a227b0098417aceb76f914aab8cf928ed4;p=thirdparty%2Fasterisk.git

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: https://origsvn.digium.com/svn/asterisk/branches/1.8@305473 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c
index 4100215470..45280bf746 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);