diff options
| author | Matteo Brancaleoni <mbrancaleoni@espia.it> | 2003-03-08 06:00:17 +0000 |
|---|---|---|
| committer | Matteo Brancaleoni <mbrancaleoni@espia.it> | 2003-03-08 06:00:17 +0000 |
| commit | d50ea0e9d465ea8eaf09844660d597f4291cab7c (patch) | |
| tree | f54c62d36f8c99997a17fc202fe190c7b4d4a4bd /apps | |
| parent | f2c4538f612a8976c7cc8893000165fa06733ddb (diff) | |
Sat Mar 8 07:00:00 CET 2003
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@635 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps')
| -rwxr-xr-x | apps/app_db.c | 5 | ||||
| -rwxr-xr-x | apps/app_macro.c | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/apps/app_db.c b/apps/app_db.c index 1ca43e869..aec99cf6e 100755 --- a/apps/app_db.c +++ b/apps/app_db.c @@ -20,6 +20,7 @@ #include <asterisk/pbx.h> #include <asterisk/module.h> #include <asterisk/pbx.h> +#include <asterisk/astdb.h> #include <stdlib.h> #include <unistd.h> #include <string.h> @@ -76,7 +77,7 @@ deltree_exec (struct ast_channel *chan, void *data) } memcpy (argv, data, arglen + 1); - if (strchr (argv, '/')) + if (strchr (argv, '/')) { { family = strsep (&argv, "/"); keytree = strsep (&argv, "\0"); @@ -88,7 +89,7 @@ deltree_exec (struct ast_channel *chan, void *data) if (!strlen (keytree)) keytree = 0; } - else + } else { family = argv; keytree = 0; diff --git a/apps/app_macro.c b/apps/app_macro.c index bb8b43de8..c06fa117f 100755 --- a/apps/app_macro.c +++ b/apps/app_macro.c @@ -184,7 +184,7 @@ out: pbx_builtin_setvar_helper(chan, "MACRO_PRIORITY", save_macro_priority); if (save_macro_priority) free(save_macro_priority); - if (!strcasecmp(chan->context, fullmacro)) { + if (!strcasecmp(chan->context, fullmacro) && !chan->_softhangup) { /* If we're leaving the macro normally, restore original information */ chan->priority = oldpriority; strncpy(chan->exten, oldexten, sizeof(chan->exten) - 1); |