From 547a41ab6bbcad0ed9195c9324ee0e38976ca93f Mon Sep 17 00:00:00 2001 From: Matthew Jordan Date: Thu, 7 Mar 2013 17:57:49 +0000 Subject: [PATCH] Let vm_mailbox_snapshot combine "Urgent" when no folder is specified r381835 fixed a bug in vm_mailbox_snapshot where combining INBOX and Old forgot that Urgent also "counts" as new messages. This fixed the problem when any of the three folders was specified and the combine option was used. It missed the case where the folder isn't specified and we build a snapshot of all folders. This patch corrects that. ........ Merged revisions 382617 from http://svn.asterisk.org/svn/asterisk/branches/11 git-svn-id: https://origsvn.digium.com/svn/asterisk/certified/branches/11.2@382618 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- apps/app_voicemail.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index d2c31a625f..2eea5be072 100644 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -15018,10 +15018,12 @@ static struct ast_vm_mailbox_snapshot *vm_mailbox_snapshot_create(const char *ma int combining_old = 0; /* Assume we are combining folders if: * - The current index is the old folder index OR - * - The current index is urgent and we were looking for INBOX OR - * - The current index is INBOX and we were looking for Urgent + * - The current index is urgent and we were looking for INBOX or all folders OR + * - The current index is INBOX and we were looking for Urgent or all folders */ - if ((i == old_index || (i == urgent_index && this_index_only == inbox_index) || (i == inbox_index && this_index_only == urgent_index)) && (combine_INBOX_and_OLD)) { + if ((i == old_index || + (i == urgent_index && (this_index_only == inbox_index || this_index_only == -1)) || + (i == inbox_index && (this_index_only == urgent_index || this_index_only == -1))) && (combine_INBOX_and_OLD)) { combining_old = 1; } -- 2.47.2