[svn-commits] mmichelson: branch 1.6.1 r188104 - in /branches/1.6.1: ./ res/res_musiconhold.c

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Mon Apr 13 14:33:04 2009
New Revision: 188104

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=188104
Log:
Merged revisions 188102 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r188102 | mmichelson | 2009-04-13 14:31:48 -0500 (Mon, 13 Apr 2009) | 5 lines
  
  Fix another crash related to cached realtime music on hold.
  
  This was another off-by-one problem caused by moh_register.
........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/res/res_musiconhold.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/res/res_musiconhold.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.1/res/res_musiconhold.c?view=diff&rev=188104&r1=188103&r2=188104
==============================================================================
--- branches/1.6.1/res/res_musiconhold.c (original)
+++ branches/1.6.1/res/res_musiconhold.c Mon Apr 13 14:33:04 2009
@@ -1062,7 +1062,9 @@
 		if (!mohclass->delete) {
  			ast_log(LOG_WARNING, "Music on Hold class '%s' already exists\n", moh->name);
 			mohclass = mohclass_unref(mohclass, "unreffing mohclass we just found by name");
-			moh = mohclass_unref(moh, "unreffing potential new moh class (it is a duplicate)");
+			if (unref) {
+				moh = mohclass_unref(moh, "unreffing potential new moh class (it is a duplicate)");
+			}
 			return -1;
 		}
 		mohclass = mohclass_unref(mohclass, "Unreffing mohclass we just found by name");