From: Joshua Colp <jcolp@digium.com>
Date: Thu, 10 Jan 2008 15:12:08 +0000 (+0000)
Subject: Merged revisions 97697 via svnmerge from
X-Git-Tag: 1.6.0-beta1~3^2~113
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8e1f8df431fd6eaedee328c72f9a3fa77e53555f;p=thirdparty%2Fasterisk.git

Merged revisions 97697 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r97697 | file | 2008-01-10 11:07:12 -0400 (Thu, 10 Jan 2008) | 6 lines

Don't try to copy the category from the group if no category exists.
(closes issue #11724)
Reported by: IgorG
Patches:
      group_count.v1.patch uploaded by IgorG (license 20)

........


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

diff --git a/funcs/func_groupcount.c b/funcs/func_groupcount.c
index a4476955d5..f0d7df1b5f 100644
--- a/funcs/func_groupcount.c
+++ b/funcs/func_groupcount.c
@@ -53,7 +53,8 @@ static int group_count_function_read(struct ast_channel *chan, const char *cmd,
 		}
 		if (gi) {
 			ast_copy_string(group, gi->group, sizeof(group));
-			ast_copy_string(category, gi->category, sizeof(category));
+			if (!ast_strlen_zero(gi->category))
+				ast_copy_string(category, gi->category, sizeof(category));
 		}
 		ast_app_group_list_unlock();
 	}