[asterisk-commits] bbryant: trunk r285534 - in /trunk: ./ apps/app_meetme.c

[SVN commits to the Asterisk project]

Author: bbryant
Date: Wed Sep  8 16:00:32 2010
New Revision: 285534

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=285534
Log:
Merged revisions 285533 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r285533 | bbryant | 2010-09-08 16:58:43 -0400 (Wed, 08 Sep 2010) | 15 lines
  
  Merged revisions 285532 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ........
    r285532 | bbryant | 2010-09-08 16:56:12 -0400 (Wed, 08 Sep 2010) | 8 lines
    
    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:
    trunk/   (props changed)
    trunk/apps/app_meetme.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: trunk/apps/app_meetme.c
URL: http://svnview.digium.com/svn/asterisk/trunk/apps/app_meetme.c?view=diff&rev=285534&r1=285533&r2=285534
==============================================================================
--- trunk/apps/app_meetme.c (original)
+++ trunk/apps/app_meetme.c Wed Sep  8 16:00:32 2010
@@ -2782,6 +2782,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;
 							}
 						}
@@ -2853,6 +2856,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) {