[svn-commits] mmichelson: branch 1.6.1 r150258 - in /branches/1.6.1: ./ apps/app_sms.c

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Thu Oct 16 17:44:31 2008
New Revision: 150258

URL: http://svn.digium.com/view/asterisk?view=rev&rev=150258
Log:
Merged revisions 150257 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
r150257 | mmichelson | 2008-10-16 17:44:05 -0500 (Thu, 16 Oct 2008) | 9 lines

Answer the channel prior to checking for the 'a'
option in app_sms.

(closes issue #13675)
Reported by: alecdavis
Patches:
      app_sms.bug13675.148985.diff.txt uploaded by alecdavis (license 585)


........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/apps/app_sms.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/apps/app_sms.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/apps/app_sms.c?view=diff&rev=150258&r1=150257&r2=150258
==============================================================================
--- branches/1.6.1/apps/app_sms.c (original)
+++ branches/1.6.1/apps/app_sms.c Thu Oct 16 17:44:31 2008
@@ -1958,6 +1958,10 @@
 		res = h.err;
 		goto done;
 	}
+	
+	if (chan->_state != AST_STATE_UP) {		/* make sure channel is answered before any TX */
+		ast_answer(chan);
+	}
 
 	if (ast_test_flag(&flags, OPTION_ANSWER)) {
 		h.framenumber = 1;                  /* Proto 2 */
@@ -1972,10 +1976,6 @@
 		sms_messagetx(&h);
 	}
 
-	if (chan->_state != AST_STATE_UP) {
-		ast_answer(chan);
-	}
-
 	res = ast_set_write_format(chan, __OUT_FMT);
 	if (res >= 0) {
 		res = ast_set_read_format(chan, AST_FORMAT_SLINEAR);