From: Mark Michelson Date: Tue, 7 Aug 2007 19:43:57 +0000 (+0000) Subject: The logic behind inboxcount's return value was reversed in has_voicemail and message_... X-Git-Tag: 1.4.10~7 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dcfb6519314f1ecbe4d96425ba85aa8db8d676dc;p=thirdparty%2Fasterisk.git The logic behind inboxcount's return value was reversed in has_voicemail and message_count. (closes issue #10401, reported by st1710, patched by me) git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@78450 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index bf2e7cdb66..d513295c4f 100644 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -2488,9 +2488,9 @@ static int has_voicemail(const char *mailbox, const char *folder) int newmsgs, oldmsgs; if(inboxcount(mailbox, &newmsgs, &oldmsgs)) - return folder? oldmsgs: newmsgs; - else return 0; + else + return folder? oldmsgs: newmsgs; } static int messagecount(const char *context, const char *mailbox, const char *folder) @@ -2503,9 +2503,9 @@ static int messagecount(const char *context, const char *mailbox, const char *fo sprintf(tmp,"%s@%s", mailbox, ast_strlen_zero(context)? "default": context); if(inboxcount(tmp, &newmsgs, &oldmsgs)) - return folder? oldmsgs: newmsgs; - else return 0; + else + return folder? oldmsgs: newmsgs; } #endif