fix pesteredo's bug

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@8413 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/src/switch_channel.c b/src/switch_channel.c
index d828113af4c4c8ad3966fe9486853607e781da9e..8c1dacd1b8094ca3cc971b5b806da022968f6764 100644 (file)
--- a/src/switch_channel.c
+++ b/src/switch_channel.c
@@ -776,6 +776,8 @@ SWITCH_DECLARE(switch_channel_state_t) switch_channel_perform_set_running_state(
                channel->state_flags = 0;
        }
 
+       switch_clear_flag(channel, CF_TAGGED);
+
        if (channel->state >= CS_ROUTING) {
                switch_clear_flag(channel, CF_TRANSFER);
                switch_channel_presence(channel, "unknown", (char *) state_names[state]);

diff --git a/src/switch_ivr_originate.c b/src/switch_ivr_originate.c
index 64382d209db791564deb91ff76452430d621fbb3..c0be20c210807b163068e62bc53a098ccaff4448 100644 (file)
--- a/src/switch_ivr_originate.c
+++ b/src/switch_ivr_originate.c
@@ -39,7 +39,7 @@ static switch_status_t originate_on_consume_media_transmit(switch_core_session_t
        switch_channel_t *channel = switch_core_session_get_channel(session);
        
        if (!switch_channel_test_flag(channel, CF_PROXY_MODE)) {
-               while(switch_channel_get_state(channel) == CS_CONSUME_MEDIA) {
+               while(switch_channel_get_state(channel) == CS_CONSUME_MEDIA && !switch_channel_test_flag(channel, CF_TAGGED)) {
                        switch_ivr_sleep(session, 10);
                }
        }