[Freeswitch-svn] [commit] r11297 - freeswitch/trunk/src

[FreeSWITCH SVN]

Author: anthm
Date: Mon Jan 19 17:30:41 2009
New Revision: 11297

Log:
update

Modified:
   freeswitch/trunk/src/switch_ivr_originate.c

Modified: freeswitch/trunk/src/switch_ivr_originate.c
==============================================================================
--- freeswitch/trunk/src/switch_ivr_originate.c	(original)
+++ freeswitch/trunk/src/switch_ivr_originate.c	Mon Jan 19 17:30:41 2009
@@ -252,6 +252,15 @@
 
 			if (oglobals) {
 				switch_channel_set_private(channel, "_oglobals_", NULL);
+				
+				if (!oglobals->progress) {
+					oglobals->progress = 1;
+				}
+			
+				if (!oglobals->ring_ready) {
+					oglobals->ring_ready = 1;
+				}
+
 				oglobals->early_ok = 1;
 			}
 		}
@@ -409,12 +418,15 @@
 				}
 			}
 
-			if (!oglobals->progress) {
-				oglobals->progress = 1;
-			}
+			if (!oglobals->monitor_early_media_ring) {
+
+				if (!oglobals->progress) {
+					oglobals->progress = 1;
+				}
 			
-			if (!oglobals->ring_ready) {
-				oglobals->ring_ready = 1;
+				if (!oglobals->ring_ready) {
+					oglobals->ring_ready = 1;
+				}
 			}
 		}