[svn-commits] jrose: branch 1.8 r361269 - /branches/1.8/apps/app_meetme.c

[SVN commits to the Digium repositories]

Author: jrose
Date: Thu Apr  5 11:36:27 2012
New Revision: 361269

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=361269
Log:
Fix MusicOnHold in MeetMe so that it always uses the class if it's been defined

There were a few instances of restarting music on hold in meetme that would cause
Asterisk to revert to the default class of music on hold for no adequate reason.

Modified:
    branches/1.8/apps/app_meetme.c

Modified: branches/1.8/apps/app_meetme.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/apps/app_meetme.c?view=diff&rev=361269&r1=361268&r2=361269
==============================================================================
--- branches/1.8/apps/app_meetme.c (original)
+++ branches/1.8/apps/app_meetme.c Thu Apr  5 11:36:27 2012
@@ -3657,7 +3657,7 @@
 								}
 								if (musiconhold && mohtempstopped && confsilence > MEETME_DELAYDETECTENDTALK) {
 									mohtempstopped = 0;
-									ast_moh_start(chan, NULL, NULL);
+									conf_start_moh(chan, optargs[OPT_ARG_MOH_CLASS]);
 								}
 							}
 						} else {
@@ -3679,7 +3679,7 @@
 						}
 						if (musiconhold && mohtempstopped && confsilence > MEETME_DELAYDETECTENDTALK) {
 							mohtempstopped = 0;
-							ast_moh_start(chan, NULL, NULL);
+							conf_start_moh(chan, optargs[OPT_ARG_MOH_CLASS]);
 						}
 					}
 				} else {