Nest event inside if statement

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@1113 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/app_queue.c b/apps/app_queue.c
index 9d451d1..d78a81e 100755 (executable)
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -158,7 +158,9 @@ static int join_queue(char *queuename, struct queue_ent *qe)
                                manager_event(EVENT_FLAG_CALL, "Join", 
                                                                "Channel: %s\r\nQueue: %s\r\nPosition: %d\r\n",
                                                                qe->chan->name, q->name, qe->pos );
-
+#if 0
+ast_log(LOG_NOTICE, "Queue '%s' Join, Channel '%s', Position '%d'\n", q->name, qe->chan->name, qe->pos );
+#endif
                        }
                        ast_pthread_mutex_unlock(&q->lock);
                        break;
@@ -211,15 +213,20 @@ static void leave_queue(struct queue_ent *qe)
        if (!q)
                return;
        ast_pthread_mutex_lock(&q->lock);
-       /* Take us out of the queue */
-       manager_event(EVENT_FLAG_CALL, "Leave",
-                                                "Channel: %s\r\nQueue: %s\r\n", 
-                                                qe->chan->name, q->name );
+
        prev = NULL;
        cur = q->head;
        while(cur) {
                if (cur == qe) {
                        q->count--;
+
+                       /* Take us out of the queue */
+                       manager_event(EVENT_FLAG_CALL, "Leave",
+                                "Channel: %s\r\nQueue: %s\r\n", 
+                                qe->chan->name, q->name );
+#if 0
+ast_log(LOG_NOTICE, "Queue '%s' Leave, Channel '%s'\n", q->name, qe->chan->name );
+#endif
                        /* Take us out of the queue */
                        if (prev)
                                prev->next = cur->next;