automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@43813 65c4cc65-6c06-0410-ace0-fbb531ad65f3

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;
 }

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;
 		}
 	}