aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--apps/app_queue.c1
-rw-r--r--channel.c3
2 files changed, 1 insertions, 3 deletions
diff --git a/apps/app_queue.c b/apps/app_queue.c
index e336fa231..84fb751b1 100644
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -2018,7 +2018,6 @@ static int wait_our_turn(struct queue_ent *qe, int ringing, enum queue_result *r
/* If we have timed out, break out */
if (qe->expire && (time(NULL) > qe->expire)) {
*reason = QUEUE_TIMEOUT;
- ast_queue_log(qe->parent->name, qe->chan->uniqueid,"NONE", "EXITWITHTIMEOUT", "%d", qe->pos);
break;
}
diff --git a/channel.c b/channel.c
index 830def796..738c6581b 100644
--- a/channel.c
+++ b/channel.c
@@ -3190,8 +3190,7 @@ int ast_setstate(struct ast_channel *chan, int state)
chan->_state = state;
ast_device_state_changed_literal(chan->name);
- manager_event(EVENT_FLAG_CALL,
- (oldstate == AST_STATE_DOWN) ? "Newchannel" : "Newstate",
+ manager_event(EVENT_FLAG_CALL, "Newstate",
"Channel: %s\r\n"
"State: %s\r\n"
"CallerID: %s\r\n"