[asterisk-commits] file: trunk r97698 - in /trunk: ./ funcs/func_groupcount.c

[SVN commits to the Asterisk project]

Author: file
Date: Thu Jan 10 09:12:08 2008
New Revision: 97698

URL: http://svn.digium.com/view/asterisk?view=rev&rev=97698
Log:
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)

........

Modified:
    trunk/   (props changed)
    trunk/funcs/func_groupcount.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/funcs/func_groupcount.c
URL: http://svn.digium.com/view/asterisk/trunk/funcs/func_groupcount.c?view=diff&rev=97698&r1=97697&r2=97698
==============================================================================
--- trunk/funcs/func_groupcount.c (original)
+++ trunk/funcs/func_groupcount.c Thu Jan 10 09:12:08 2008
@@ -53,7 +53,8 @@
 		}
 		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();
 	}