automerge commit

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

diff --git a/channels/chan_agent.c b/channels/chan_agent.c
index 964413281b8c6c7bffabec1e690bedb74f7d6d6f..2c84b8f105f0fa8aa24f6d42b40e59c0a5c2267c 100644 (file)
--- a/channels/chan_agent.c
+++ b/channels/chan_agent.c
@@ -1480,15 +1480,13 @@ static int agent_logoff(char *agent, int soft)
 
        for (p=agents; p; p=p->next) {
                if (!strcasecmp(p->agent, agent)) {
+                       if (p->owner || p->chan)
+                               defer = 1;
                        if (!soft) {
-                               if (p->owner) {
-                                       defer = 1;
+                               if (p->owner)
                                        ast_softhangup(p->owner, AST_SOFTHANGUP_EXPLICIT);
-                               }
-                               if (p->chan) {
-                                       defer = 1;
+                               if (p->chan)
                                        ast_softhangup(p->chan, AST_SOFTHANGUP_EXPLICIT);
-                               }
                        }
                        ret = 0; /* found an agent => return 0 */
                        logintime = time(NULL) - p->loginstart;