From: Automerge script Date: Thu, 30 Mar 2006 18:01:47 +0000 (+0000) Subject: automerge commit X-Git-Tag: 1.2.7-netsec~26 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d2f451ef0c1a3caae9dcc040d2d5f89f616142d7;p=thirdparty%2Fasterisk.git automerge commit git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@16545 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c index 2a27dcec8a..97ae3d8712 100644 --- a/res/res_musiconhold.c +++ b/res/res_musiconhold.c @@ -778,6 +778,11 @@ static int moh_scan_files(struct mohclass *class) { if (i == class->total_files) strcpy(class->filearray[class->total_files++], filepath); + + /* If the new total files is equal to the maximum allowed, stop adding new ones */ + if (class->total_files == MAX_MOHFILES) + break; + } closedir(files_DIR);