diff options
| author | Kevin P. Fleming <kpfleming@digium.com> | 2006-07-19 20:44:39 +0000 |
|---|---|---|
| committer | Kevin P. Fleming <kpfleming@digium.com> | 2006-07-19 20:44:39 +0000 |
| commit | 6d0742fc1657017a3e69558b6192399b2f8469e6 (patch) | |
| tree | 3c36781db3a5a7a08967cbe8d83acb5d82e581cb /apps/app_followme.c | |
| parent | 54e1f06c463bf72fa730f9be042d62f4ee2c4593 (diff) | |
merge Russell's 'hold_handling' branch, finally implementing music-on-hold handling the way it was decided at AstriDevCon Europe 2006 (and the way people really want it to be)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@37988 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps/app_followme.c')
| -rw-r--r-- | apps/app_followme.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/apps/app_followme.c b/apps/app_followme.c index 85dda00aa..42986c96f 100644 --- a/apps/app_followme.c +++ b/apps/app_followme.c @@ -1010,10 +1010,7 @@ static int app_exec(struct ast_channel *chan, void *data) goto outrun; if (ast_waitstream(chan, "") < 0) goto outrun; - if (!strcmp(targs.mohclass, "")) - ast_moh_start(chan, NULL); - else - ast_moh_start(chan, targs.mohclass); + ast_moh_start(chan, S_OR(targs.mohclass, NULL), NULL); targs.status = 0; |