aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--apps/app_playback.c9
-rw-r--r--pbx.c2
2 files changed, 6 insertions, 5 deletions
diff --git a/apps/app_playback.c b/apps/app_playback.c
index ed33097ab..71c9bc743 100644
--- a/apps/app_playback.c
+++ b/apps/app_playback.c
@@ -110,6 +110,7 @@ static int playback_exec(struct ast_channel *chan, void *data)
if (chan->_state != AST_STATE_UP) {
if (option_skip) {
/* At the user's option, skip if the line is not up */
+ pbx_builtin_setvar_helper(chan, "PLAYBACKSTATUS", "SUCCESS");
LOCAL_USER_REMOVE(u);
return 0;
} else if (!option_noanswer)
@@ -137,11 +138,11 @@ static int playback_exec(struct ast_channel *chan, void *data)
}
front = back;
}
- if (mres)
- pbx_builtin_setvar_helper(chan, "PLAYBACKSTATUS", "FAILED");
- else
- pbx_builtin_setvar_helper(chan, "PLAYBACKSTATUS", "SUCCESS");
}
+ if (mres)
+ pbx_builtin_setvar_helper(chan, "PLAYBACKSTATUS", "FAILED");
+ else
+ pbx_builtin_setvar_helper(chan, "PLAYBACKSTATUS", "SUCCESS");
LOCAL_USER_REMOVE(u);
return res;
}
diff --git a/pbx.c b/pbx.c
index cfa93195e..f48e6b27a 100644
--- a/pbx.c
+++ b/pbx.c
@@ -5745,7 +5745,7 @@ static int pbx_builtin_background(struct ast_channel *chan, void *data)
break;
default:
ast_log(LOG_WARNING, "Background requires an argument (filename)\n");
- break;
+ return -1;
}
}