Fixes a bug with MeetMe where after announcing the amount of time left in a conferenc...

(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 3cbc664e39c34b32fee4ffea2fdd2cb7ec040719..4ef16189d938e155056849cba2db2547c2aedbaa 100644 (file)
--- 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) {