fix (MODAPP-115) and check-print error on vm-inject if it happens

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@9203 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 6721df3247711e206feb47f9465182ec643f578e..96fe5ab7aa3a17210a9231f00db207131fb77bc0 100644 (file)
--- a/src/mod/applications/mod_voicemail/mod_voicemail.c
+++ b/src/mod/applications/mod_voicemail/mod_voicemail.c
@@ -1389,25 +1389,6 @@ static void voicemail_check_main(switch_core_session_t *session, const char *pro
                                        continue;
                                }
 
-                               if (total_saved_urgent_messages > 0) {
-                                       switch_snprintf(msg_count, sizeof(msg_count), "%d:urgent-saved", total_saved_urgent_messages);
-                                       TRY_CODE(switch_ivr_phrase_macro(session, VM_MESSAGE_COUNT_MACRO, msg_count, NULL, NULL));
-                                       informed++;
-                               }
-
-                               if (total_saved_messages > 0 && total_saved_messages != total_saved_urgent_messages) {
-                                       switch_snprintf(msg_count, sizeof(msg_count), "%d:saved", total_saved_messages);
-                                       TRY_CODE(switch_ivr_phrase_macro(session, VM_MESSAGE_COUNT_MACRO, msg_count, NULL, NULL));
-                                       informed++;
-                               }
-
-                               if (!heard_auto_saved && total_saved_messages + total_saved_urgent_messages > 0) {
-                                       heard_auto_saved = 1;
-                                       play_msg_type = MSG_SAVED;
-                                       vm_check_state = VM_CHECK_PLAY_MESSAGES;
-                                       continue;
-                               }
-
                                if (!informed) {
                                        switch_snprintf(msg_count, sizeof(msg_count), "0:new");
                                        TRY_CODE(switch_ivr_phrase_macro(session, VM_MESSAGE_COUNT_MACRO, msg_count, NULL, NULL));
@@ -2433,8 +2414,11 @@ static switch_status_t voicemail_leave_main(switch_core_session_t *session, cons
 
        if ((vm_cc = switch_channel_get_variable(channel, "vm_cc"))) {
                char *cmd = switch_core_session_sprintf(session, "%s %s %s %s", vm_cc, file_path, caller_id_number, caller_id_name);
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Sent Carbon Copy to %s\n", vm_cc);
-               voicemail_inject(cmd);
+               if (voicemail_inject(cmd) == SWITCH_STATUS_SUCCESS) {
+                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Sent Carbon Copy to %s\n", vm_cc);
+               } else {
+                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to Carbon Copy to %s\n", vm_cc);
+               }
        }
 
  end: