tweak on calle[re] id

diff --git a/src/switch_channel.c b/src/switch_channel.c
index b0ee9f527c1f018942eb14b05609a1179d341654..ef21e8c8f1620849c87584d70061a63e2f8d6ab3 100644 (file)
--- a/src/switch_channel.c
+++ b/src/switch_channel.c
@@ -2386,6 +2386,8 @@ SWITCH_DECLARE(void) switch_channel_set_caller_extension(switch_channel_t *chann
 {
        switch_assert(channel != NULL);
 
+       switch_channel_set_flag(channel, CF_DIALPLAN);
+
        switch_mutex_lock(channel->profile_mutex);
        caller_extension->next = channel->caller_profile->caller_extension;
        channel->caller_profile->caller_extension = caller_extension;

diff --git a/src/switch_core_state_machine.c b/src/switch_core_state_machine.c
index 59cc17d33ad24e0022ca484ec73aa4342a4de153..ccd6dacc9ccd9823af8385aaa552ec4f9e2bbc0b 100644 (file)
--- a/src/switch_core_state_machine.c
+++ b/src/switch_core_state_machine.c
@@ -123,9 +123,7 @@ static void switch_core_standard_on_routing(switch_core_session_t *session)
                        }
                }
 
-               if (count) {
-                       switch_channel_set_flag(session->channel, CF_DIALPLAN);
-               } else {
+               if (!count) {
                        if (switch_channel_direction(session->channel) == SWITCH_CALL_DIRECTION_OUTBOUND) {
                                if (switch_channel_test_flag(session->channel, CF_ANSWERED)) {
                                        switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG,