From: Russell Bryant Date: Fri, 8 Jun 2007 22:23:49 +0000 (+0000) Subject: Merged revisions 68527 via svnmerge from X-Git-Tag: 1.6.0-beta1~3^2~2413 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1441cc8b94b0d9bf4cb8b8ec169250fbaee32436;p=thirdparty%2Fasterisk.git Merged revisions 68527 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ................ r68527 | russell | 2007-06-08 17:23:22 -0500 (Fri, 08 Jun 2007) | 12 lines Merged revisions 68526 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r68526 | russell | 2007-06-08 17:22:36 -0500 (Fri, 08 Jun 2007) | 4 lines Don't automatically hang up after running Dictate so that callers can exit cleanly using '#' (closes issue #9577, patch from Thomas Andrews) ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@68528 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/apps/app_dictate.c b/apps/app_dictate.c index 55d8ba96cc..c501b3f784 100644 --- a/apps/app_dictate.c +++ b/apps/app_dictate.c @@ -331,7 +331,7 @@ static int dictate_exec(struct ast_channel *chan, void *data) ast_set_read_format(chan, oldr); } ast_module_user_remove(u); - return res; + return 0; } static int unload_module(void)