From: Brett Bryant <bbryant@digium.com>
Date: Wed, 8 Sep 2010 20:56:12 +0000 (+0000)
Subject: Fixes a bug with MeetMe where after announcing the amount of time left in a conferenc... 
X-Git-Tag: 1.6.2.14-rc1~36
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=68d3fea0018c761b1e72f77e10e2a74be7e8c387;p=thirdparty%2Fasterisk.git

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@285532 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index 3cbc664e39..4ef16189d9 100644
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -2622,6 +2622,9 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c
 								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 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c
  								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) {