[asterisk-commits] mmichelson: branch 1.6.1 r157596 - in /branches/1.6.1: ./ res/res_musiconhold.c

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Tue Nov 18 17:59:41 2008
New Revision: 157596

URL: http://svn.digium.com/view/asterisk?view=rev&rev=157596
Log:
Merged revisions 157592 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
r157592 | mmichelson | 2008-11-18 17:59:02 -0600 (Tue, 18 Nov 2008) | 10 lines

This change prevents a crash from occurring if res_musiconhold.so
is unloaded and then Asterisk is stopped. The problem was that
we are not unregistering the ast_moh_destroy function at exit.

(closes issue #13761)
Reported by: eliel
Patches:
      res_musiconhold.c.patch uploaded by eliel (license 64)


........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/res/res_musiconhold.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/res/res_musiconhold.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/res/res_musiconhold.c?view=diff&rev=157596&r1=157595&r2=157596
==============================================================================
--- branches/1.6.1/res/res_musiconhold.c (original)
+++ branches/1.6.1/res/res_musiconhold.c Tue Nov 18 17:59:41 2008
@@ -1661,6 +1661,7 @@
 	res |= ast_unregister_application(start_moh);
 	res |= ast_unregister_application(stop_moh);
 	ast_cli_unregister_multiple(cli_moh, sizeof(cli_moh) / sizeof(struct ast_cli_entry));
+	ast_unregister_atexit(ast_moh_destroy);
 	return res;
 }