[asterisk-commits] rmudgett: trunk r318784 - in /trunk: ./ channels/sig_pri.c

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Thu May 12 20:50:15 2011
New Revision: 318784

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=318784
Log:
Merged revisions 318783 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r318783 | rmudgett | 2011-05-12 20:47:05 -0500 (Thu, 12 May 2011) | 14 lines
  
  PRI early media won't ring.
  
  And another way to pass early media.  Don't indicate that there is inband
  information present, just assume that the B channel is connected.
  
  * Restore clearing the dialing flag Rx squelch unconditionally when a
  PROCEEDING message comes in.
  
  (closes issue #19268)
  Reported by: tbsky
  Patches:
        issue19268_v1.8.patch uploaded by rmudgett (license 664)
  Tested by: tbsky
........

Modified:
    trunk/   (props changed)
    trunk/channels/sig_pri.c

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

Modified: trunk/channels/sig_pri.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/sig_pri.c?view=diff&rev=318784&r1=318783&r2=318784
==============================================================================
--- trunk/channels/sig_pri.c (original)
+++ trunk/channels/sig_pri.c Thu May 12 20:50:15 2011
@@ -6368,9 +6368,9 @@
 					/* Bring voice path up */
 					pri_queue_control(pri, chanpos, AST_CONTROL_PROGRESS);
 					pri->pvts[chanpos]->progress = 1;
-					sig_pri_set_dialing(pri->pvts[chanpos], 0);
 					sig_pri_open_media(pri->pvts[chanpos]);
 				}
+				sig_pri_set_dialing(pri->pvts[chanpos], 0);
 				sig_pri_unlock_private(pri->pvts[chanpos]);
 				break;
 			case PRI_EVENT_FACILITY: