Fix SetVar (bug #3668) and g + transfer (#3650)
authorMark Spencer <markster@digium.com>
Sat, 26 Feb 2005 03:57:10 +0000 (03:57 +0000)
committerMark Spencer <markster@digium.com>
Sat, 26 Feb 2005 03:57:10 +0000 (03:57 +0000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@5083 65c4cc65-6c06-0410-ace0-fbb531ad65f3

apps/app_dial.c
pbx.c

index da8888d..3920ba4 100755 (executable)
@@ -1282,7 +1282,7 @@ out:
        
        LOCAL_USER_REMOVE(u);
        
-       if ((ast_test_flag(peerflags, DIAL_GO_ON)) && (!chan->_softhangup))
+       if ((ast_test_flag(peerflags, DIAL_GO_ON)) && (!chan->_softhangup) && (res != AST_PBX_KEEPALIVE))
            res=0;
            
        return res;
diff --git a/pbx.c b/pbx.c
index 77fdfc4..ffc14e5 100755 (executable)
--- a/pbx.c
+++ b/pbx.c
@@ -5320,7 +5320,7 @@ int pbx_builtin_setvar(struct ast_channel *chan, void *data)
        char *name, *value, *mydata, *next, *fstr = NULL;
        struct ast_flags flags = {0};
 
-       if (data && !ast_strlen_zero(data) && chan->cdr && (mydata = ast_strdupa(data))) {
+       if (data && !ast_strlen_zero(data) && (mydata = ast_strdupa(data))) {
                next = mydata;
                while(next) {
                        name = next;