diff options
| author | Jonathan Rose <jrose@digium.com> | 2014-04-17 22:42:57 +0000 |
|---|---|---|
| committer | Jonathan Rose <jrose@digium.com> | 2014-04-17 22:42:57 +0000 |
| commit | c76608f24b1561ae9faff484381433df06631713 (patch) | |
| tree | b173c5a8fea7f5b32309d2ccb27ec6853440dd54 /main/app.c | |
| parent | a8742e327f8de3866526a653977c0eae58d85d40 (diff) | |
Fix a silly shadowed variable mistake that was missed from play tones patch
........
Merged revisions 412549 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@412550 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/app.c')
| -rw-r--r-- | main/app.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/main/app.c b/main/app.c index f7bb0048c..a02c6d671 100644 --- a/main/app.c +++ b/main/app.c @@ -1140,7 +1140,7 @@ int ast_control_tone(struct ast_channel *chan, const char *tone) struct ast_tone_zone *zone = NULL; struct ast_tone_zone_sound *ts; int paused = 0; - int res; + int res = 0; const char *tone_indication = NULL; const char *tone_zone = NULL; @@ -1168,7 +1168,6 @@ int ast_control_tone(struct ast_channel *chan, const char *tone) for (;;) { struct ast_frame *fr; - int res; if (ast_waitfor(chan, -1) < 0) { res = -1; |