From 233e26b1124a8ca760b81b9db08a02ebd9751f8f Mon Sep 17 00:00:00 2001
From: Mark Spencer <markster@digium.com>
Date: Sat, 26 Feb 2005 03:57:10 +0000
Subject: [PATCH] Fix SetVar (bug #3668) and g + transfer (#3650)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@5083 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
apps/app_dial.c | 2 +-
pbx.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/apps/app_dial.c b/apps/app_dial.c
index da8888d5f1..3920ba4e1d 100755
--- a/apps/app_dial.c
+++ b/apps/app_dial.c
@@ -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 77fdfc4614..ffc14e5c78 100755
--- 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;
--
GitLab