fix regression from 27c6d1111c8eb9929cedf707632b33405019e03a

diff --git a/src/switch_channel.c b/src/switch_channel.c
index 2dd7d987daf5b64d7f0fd14af74e968ff1a15fe7..6830bd0bc6281f8ecf531e3dfdb8c3e1ee5ec13d 100644 (file)
--- a/src/switch_channel.c
+++ b/src/switch_channel.c
@@ -2661,11 +2661,10 @@ SWITCH_DECLARE(switch_status_t) switch_channel_perform_mark_pre_answered(switch_
                        switch_mutex_unlock(channel->profile_mutex);
                }
 
-               if (switch_channel_execute_on(channel, SWITCH_CHANNEL_EXECUTE_ON_PRE_ANSWER_VARIABLE) != SWITCH_STATUS_SUCCESS) {
-                       if (!switch_channel_test_flag(channel, CF_EARLY_MEDIA)) {
-                               switch_channel_execute_on(channel, SWITCH_CHANNEL_EXECUTE_ON_MEDIA_VARIABLE);
-                       }
-               }
+               switch_channel_execute_on(channel, SWITCH_CHANNEL_EXECUTE_ON_PRE_ANSWER_VARIABLE);
+               switch_channel_execute_on(channel, SWITCH_CHANNEL_EXECUTE_ON_MEDIA_VARIABLE);
+
+
 
                if ((var = switch_channel_get_variable(channel, SWITCH_PASSTHRU_PTIME_MISMATCH_VARIABLE))) {
                        switch_channel_set_flag(channel, CF_PASSTHRU_PTIME_MISMATCH);
@@ -2861,10 +2860,10 @@ SWITCH_DECLARE(switch_status_t) switch_channel_perform_mark_answered(switch_chan
                                          channel->name);
 
 
-       if (switch_channel_execute_on(channel, SWITCH_CHANNEL_EXECUTE_ON_ANSWER_VARIABLE) != SWITCH_STATUS_SUCCESS) {
-               if (!switch_channel_test_flag(channel, CF_EARLY_MEDIA)) {
-                       switch_channel_execute_on(channel, SWITCH_CHANNEL_EXECUTE_ON_MEDIA_VARIABLE);
-               }
+       switch_channel_execute_on(channel, SWITCH_CHANNEL_EXECUTE_ON_ANSWER_VARIABLE);
+
+       if (!switch_channel_test_flag(channel, CF_EARLY_MEDIA)) {
+               switch_channel_execute_on(channel, SWITCH_CHANNEL_EXECUTE_ON_MEDIA_VARIABLE);
        }
 
        if ((var = switch_channel_get_variable(channel, SWITCH_CHANNEL_API_ON_ANSWER_VARIABLE)) && !zstr(var)) {