diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-02-28 07:14:40 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-02-28 07:14:40 +0000 |
| commit | cd2266f902e36e94cbc57449bfb4ad762e0b4b04 (patch) | |
| tree | ea2d31bc0ee866fbbc1e3b2726aafc935f382587 /apps | |
| parent | b572ade4b37c3e952e35a3f2d0548980ac3ff834 (diff) | |
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.2@249407 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/app_voicemail.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index b20d59252..a52003406 100644 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -4933,7 +4933,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) |