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
  ........
................

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

diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index 85bb0a645c35ada2a1f15423b53061dd8c62e05d..2f64a9b784c0455323dbc6718fbadf0a82d8beea 100644 (file)
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -2782,6 +2782,9 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, struc
                                                                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 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, struc
                                                                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) {