summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authorMatt O'Gorman <mogorman@digium.com>2006-01-18 21:12:14 +0000
committerMatt O'Gorman <mogorman@digium.com>2006-01-18 21:12:14 +0000
commitd57bc8a513f1371150a8e6b4a5c80bae88708c3f (patch)
tree4feaac1600f1f025da784a76255a1dad31cbbfdf /apps
parent5b748f587caf5388526f7124705a13f591f321c8 (diff)
Merged revisions 8194 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r8194 | mogorman | 2006-01-18 15:02:06 -0600 (Wed, 18 Jan 2006) | 3 lines Solves issue with the login proccess in meetme patch from 6136 ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@8195 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps')
-rw-r--r--apps/app_meetme.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index da6d684e3..a0a728e3b 100644
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -1759,7 +1759,8 @@ static struct ast_conference *find_conf(struct ast_channel *chan, char *confno,
if (dynamic_pin) {
if (dynamic_pin[0] == 'q') {
/* Query the user to enter a PIN */
- ast_app_getdata(chan, "conf-getpin", dynamic_pin, AST_MAX_EXTENSION - 1, 0);
+ if (ast_app_getdata(chan, "conf-getpin", dynamic_pin, AST_MAX_EXTENSION - 1, 0) < 0)
+ return NULL;
}
cnf = build_conf(confno, dynamic_pin, "", make, dynamic);
} else {