tweak

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

diff --git a/src/mod/applications/mod_voicemail/mod_voicemail.c b/src/mod/applications/mod_voicemail/mod_voicemail.c
index 23fd955fd99da06287bff17ca4f9b37cb12fa679..bd3cdcdbbc46ccdc9ea9de6dc57e6e988e1d06e9 100644 (file)
--- a/src/mod/applications/mod_voicemail/mod_voicemail.c
+++ b/src/mod/applications/mod_voicemail/mod_voicemail.c
@@ -901,7 +901,11 @@ record_file:
                        if (unlink(file_path) != 0) {
                                switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "failed to delete file [%s]\n", file_path);
                        }
-            goto end;
+            if (switch_channel_ready(channel)) {
+                goto record_file;
+            } else {
+                goto end;
+            }
         } else {
             status = SWITCH_STATUS_SUCCESS;
         }

diff --git a/src/switch_ivr_play_say.c b/src/switch_ivr_play_say.c
index a7ade3f1431a9947ec2ba2a970ca6203202f131c..a552c670ae3ba46302ed41f333e925f82bca43d7 100644 (file)
--- a/src/switch_ivr_play_say.c
+++ b/src/switch_ivr_play_say.c
@@ -126,7 +126,9 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_phrase_macro(switch_core_session_t *s
        switch_event_add_header_string(hint_data, SWITCH_STACK_BOTTOM, "lang", chan_lang);
        if (data) {
                switch_event_add_header_string(hint_data, SWITCH_STACK_BOTTOM, "data", data);
-       }
+       } else {
+        data = "";
+    }
        switch_channel_event_set_data(channel, hint_data);
 
        if (switch_xml_locate("phrases", NULL, NULL, NULL, &xml, &cfg, hint_data) != SWITCH_STATUS_SUCCESS) {