[asterisk-commits] russell: trunk r68528 - in /trunk: ./ apps/app_dictate.c

[asterisk-commits at lists.digium.com]

Author: russell
Date: Fri Jun  8 17:23:49 2007
New Revision: 68528

URL: http://svn.digium.com/view/asterisk?view=rev&rev=68528
Log:
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)

........

................

Modified:
    trunk/   (props changed)
    trunk/apps/app_dictate.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/apps/app_dictate.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_dictate.c?view=diff&rev=68528&r1=68527&r2=68528
==============================================================================
--- trunk/apps/app_dictate.c (original)
+++ trunk/apps/app_dictate.c Fri Jun  8 17:23:49 2007
@@ -331,7 +331,7 @@
 		ast_set_read_format(chan, oldr);
 	}
 	ast_module_user_remove(u);
-	return res;
+	return 0;
 }
 
 static int unload_module(void)