[svn-commits] dvossel: branch dvossel/hd_confbridge r311679 - /team/dvossel/hd_confbridge/a...

SVN commits to the Digium repositories svn-commits at lists.digium.com
Fri Mar 25 11:24:38 CDT 2011


Author: dvossel
Date: Fri Mar 25 11:24:34 2011
New Revision: 311679

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=311679
Log:
Fixes initial confbridge.conf load error

Modified:
    team/dvossel/hd_confbridge/apps/confbridge/conf_config_parser.c

Modified: team/dvossel/hd_confbridge/apps/confbridge/conf_config_parser.c
URL: http://svnview.digium.com/svn/asterisk/team/dvossel/hd_confbridge/apps/confbridge/conf_config_parser.c?view=diff&rev=311679&r1=311678&r2=311679
==============================================================================
--- team/dvossel/hd_confbridge/apps/confbridge/conf_config_parser.c (original)
+++ team/dvossel/hd_confbridge/apps/confbridge/conf_config_parser.c Fri Mar 25 11:24:34 2011
@@ -469,9 +469,13 @@
 	b_profile->max_members = 0;
 	b_profile->mix_interval = 0;
 	memset(b_profile->rec_file, 0, sizeof(b_profile->rec_file));
-	ao2_ref(b_profile->sounds, -1); /* sounds is read only.  Once it has been created
-	                                 * it can never be altered. This prevents having to
-	                                 * do any locking after it is built from the config. */
+	if (b_profile->sounds) {
+		ao2_ref(b_profile->sounds, -1); /* sounds is read only.  Once it has been created
+		                                 * it can never be altered. This prevents having to
+		                                 * do any locking after it is built from the config. */
+		b_profile->sounds = NULL;
+	}
+
 	if (!(b_profile->sounds = bridge_profile_sounds_alloc())) {
 		ao2_unlock(b_profile);
 		ao2_ref(b_profile, -1);




More information about the svn-commits mailing list