From 2bf63fcf990ba58a6a3c40a9b70e2e3644ad1bc3 Mon Sep 17 00:00:00 2001 From: tilghman Date: Sun, 28 Feb 2010 07:13:39 +0000 Subject: Merged revisions 249405 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ........ r249405 | tilghman | 2010-02-28 01:10:22 -0600 (Sun, 28 Feb 2010) | 2 lines Properly document voicemail API documents. Also fix a crash reported via the -dev list. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@249406 f38db490-d61c-443f-a65b-d21fe96a405b --- apps/app_voicemail.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'apps') diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index 72d8e91f8..3278ec790 100644 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -4807,7 +4807,7 @@ static int copy_message(struct ast_channel *chan, struct ast_vm_user *vmu, int i static int messagecount(const char *context, const char *mailbox, const char *folder) { - return __has_voicemail(context, mailbox, folder, 0) + (strcmp(folder, "INBOX") ? 0 : __has_voicemail(context, mailbox, "Urgent", 0)); + return __has_voicemail(context, mailbox, folder, 0) + (folder && strcmp(folder, "INBOX") ? 0 : __has_voicemail(context, mailbox, "Urgent", 0)); } static int __has_voicemail(const char *context, const char *mailbox, const char *folder, int shortcircuit) -- cgit v1.2.3