[svn-commits] qwell: trunk r90631 - in /trunk: ./ res/res_features.c

[SVN commits to the Digium repositories]

Author: qwell
Date: Mon Dec  3 14:58:26 2007
New Revision: 90631

URL: http://svn.digium.com/view/asterisk?view=rev&rev=90631
Log:
Merged revisions 90607 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

(Closes issue #11436)
........
r90607 | qwell | 2007-12-03 14:51:17 -0600 (Mon, 03 Dec 2007) | 4 lines

Fix crash in ParkAndAnnounce application.

Issue #11436, reported by lytledd, patch by eliel.

........

Modified:
    trunk/   (props changed)
    trunk/res/res_features.c

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

Modified: trunk/res/res_features.c
URL: http://svn.digium.com/view/asterisk/trunk/res/res_features.c?view=diff&rev=90631&r1=90630&r2=90631
==============================================================================
--- trunk/res/res_features.c (original)
+++ trunk/res/res_features.c Mon Dec  3 14:58:26 2007
@@ -492,7 +492,7 @@
 	if (!con)	/* Still no context? Bad */
 		ast_log(LOG_ERROR, "Parking context '%s' does not exist and unable to create\n", parking_con);
 	/* Tell the peer channel the number of the parking space */
-	if ((peer && pu->parkingnum != -1 && ast_strlen_zero(orig_chan_name)) || !strcasecmp(peer->name, orig_chan_name)) { /* Only say number if it's a number and the channel hasn't been masqueraded away */
+	if (peer && ((pu->parkingnum != -1 && ast_strlen_zero(orig_chan_name)) || !strcasecmp(peer->name, orig_chan_name))) { /* Only say number if it's a number and the channel hasn't been masqueraded away */
 		/* Make sure we don't start saying digits to the channel being parked */
 		ast_set_flag(peer, AST_FLAG_MASQ_NOSTREAM);
 		ast_say_digits(peer, pu->parkingnum, "", peer->language);