Author: mmichelson Date: Fri Jul 20 13:44:30 2007 New Revision: 76140 URL: http://svn.digium.com/view/asterisk?view=rev&rev=76140 Log: Merged revisions 76139 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r76139 | mmichelson | 2007-07-20 13:42:27 -0500 (Fri, 20 Jul 2007) | 6 lines
When using users.conf for the entries in the directory, if multiple users had
the same last name, only the first user listed would be available
in the directory.
(closes issue #10200, reported by mrskippy, patched by me)
........
Modified:
trunk/ (props changed)
trunk/apps/app_directory.c
Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.
Modified: trunk/apps/app_directory.c
URL:
http://svn.digium.com/view/asterisk/trunk/apps/app_directory.c?view=diff&rev=76140&r1=76139&r2=76140
==============================================================================
--- trunk/apps/app_directory.c (original)
+++ trunk/apps/app_directory.c Fri Jul 20 13:44:30 2007
@@ -404,6 +404,7 @@
int lastuserchoice = 0;
char *start, *conv, *stringp = NULL;
const char *pos;
+ int breakout = 0;
if (ast_strlen_zero(context)) {
ast_log(LOG_WARNING,
@@ -527,6 +528,7 @@
* user hungup
*/
lastuserchoice
= 0;
+ breakout = 1;
break;
case '1':
/* user pressed
'1' and extensions exists;
@@ -534,19 +536,23 @@
a goto() on
the channel
*/
lastuserchoice
= res;
+ breakout = 1;
break;
case '*':
/* user pressed
'*' to skip something found */
lastuserchoice
= res;
+ breakout = 0;
res = 0;
break;
default:
+ breakout = 1;
break;
}
ast_free(conv);
- break;
- }
- ast_free(conv);
+ if (breakout)
+ break;
+ } else
+ ast_free(conv);
}
}
}
_______________________________________________
--Bandwidth and Colocation Provided by http://www.api-digital.com--
svn-commits mailing list
To UNSUBSCRIBE or update options visit:
http://lists.digium.com/mailman/listinfo/svn-commits
