[asterisk-commits] bbryant: branch 1.6.2 r285532 - /branches/1.6.2/apps/app_meetme.c

[SVN commits to the Asterisk project]

Author: bbryant
Date: Wed Sep  8 15:56:12 2010
New Revision: 285532

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=285532
Log:
Fixes a bug with MeetMe where after announcing the amount of time left in a conference, if music on hold was playing, it doesn't restart.

(closes issue #17408)
Reported by: sysreq
Patches: 
      asterisk-issue-17408_fixed.patch uploaded by sysreq (license 1009)
Tested by: sysreq

Modified:
    branches/1.6.2/apps/app_meetme.c

Modified: branches/1.6.2/apps/app_meetme.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/apps/app_meetme.c?view=diff&rev=285532&r1=285531&r2=285532
==============================================================================
--- branches/1.6.2/apps/app_meetme.c (original)
+++ branches/1.6.2/apps/app_meetme.c Wed Sep  8 15:56:12 2010
@@ -2622,6 +2622,9 @@
 								ast_say_digits(chan, (conf->endtime - now.tv_sec) / 60, "", chan->language);
 								if (!ast_streamfile(chan, "minutes", chan->language))
 									ast_waitstream(chan, "");
+								if (musiconhold) {
+									conf_start_moh(chan, optargs[OPT_ARG_MOH_CLASS]);
+								}
 								announcement_played = 1;
 							}
 						}
@@ -2693,6 +2696,9 @@
  								res = ast_streamfile(chan, user->warning_sound, chan->language);
  								res = ast_waitstream(chan, "");
  							}
+							if (musiconhold) {
+								conf_start_moh(chan, optargs[OPT_ARG_MOH_CLASS]);
+							}
  						}
  					}
  					if (user->warning_freq) {