Bug 5960

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@7407 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index 03ddc7bb20380e0150cae931f390aa7e99178a63..dec07f918c29e616ce1515b7858815593c1ed52d 100644 (file)
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -536,10 +536,10 @@ static struct ast_vm_user *find_user_realtime(struct ast_vm_user *ivm, const cha
                if (mailbox) 
                        ast_copy_string(retval->mailbox, mailbox, sizeof(retval->mailbox));
                populate_defaults(retval);
-               if (ast_test_flag((&globalflags), VM_SEARCH))
+               if (!context && ast_test_flag((&globalflags), VM_SEARCH))
                        var = ast_load_realtime("voicemail", "mailbox", mailbox, NULL);
                else
-                       var = ast_load_realtime("voicemail", "mailbox", mailbox, "context", retval->context, NULL);
+                       var = ast_load_realtime("voicemail", "mailbox", mailbox, "context", context, NULL);
                if (var) {
                        tmp = var;
                        while(tmp) {