]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
check for vm caller id info later so if its transfered it gets the updated details
authorMichael Jerris <mike@jerris.com>
Wed, 6 Mar 2013 18:23:28 +0000 (13:23 -0500)
committerMichael Jerris <mike@jerris.com>
Wed, 6 Mar 2013 18:23:28 +0000 (13:23 -0500)
src/mod/applications/mod_voicemail/mod_voicemail.c

index 6682cf5eec44791aebd9dfb3d82ff5a83978f799..ccb0811ddd17a00e9bd95936617e807c76f17d68 100644 (file)
@@ -3271,14 +3271,6 @@ static switch_status_t voicemail_leave_main(switch_core_session_t *session, vm_p
        switch_channel_set_variable(channel, "skip_greeting", NULL);
        switch_channel_set_variable(channel, "skip_instructions", NULL);
 
-       if (!(caller_id_name = switch_channel_get_variable(channel, "effective_caller_id_name"))) {
-               caller_id_name = caller_profile->caller_id_name;
-       }
-
-       if (!(caller_id_number = switch_channel_get_variable(channel, "effective_caller_id_number"))) {
-               caller_id_number = caller_profile->caller_id_number;
-       }
-
        memset(&cbt, 0, sizeof(cbt));
 
        if (id) {
@@ -3505,6 +3497,14 @@ static switch_status_t voicemail_leave_main(switch_core_session_t *session, vm_p
        cc.noexit = 1;
        args.buf = &cc;
 
+       if (!(caller_id_name = switch_channel_get_variable(channel, "effective_caller_id_name"))) {
+               caller_id_name = caller_profile->caller_id_name;
+       }
+
+       if (!(caller_id_number = switch_channel_get_variable(channel, "effective_caller_id_number"))) {
+               caller_id_number = caller_profile->caller_id_number;
+       }
+
        switch_channel_set_variable_printf(channel, "RECORD_ARTIST", "%s (%s)", caller_id_name, caller_id_number);
 
        switch_time_exp_lt(&tm, ts);