[asterisk-commits] russell: branch russell/sla_reload r70782 - /team/russell/sla_reload/apps/

[SVN commits to the Asterisk project]

Author: russell
Date: Thu Jun 21 13:34:15 2007
New Revision: 70782

URL: http://svn.digium.com/view/asterisk?view=rev&rev=70782
Log:
silly me forgot to unlock before return ... again

Modified:
    team/russell/sla_reload/apps/app_meetme.c

Modified: team/russell/sla_reload/apps/app_meetme.c
URL: http://svn.digium.com/view/asterisk/team/russell/sla_reload/apps/app_meetme.c?view=diff&rev=70782&r1=70781&r2=70782
==============================================================================
--- team/russell/sla_reload/apps/app_meetme.c (original)
+++ team/russell/sla_reload/apps/app_meetme.c Thu Jun 21 13:34:15 2007
@@ -4019,21 +4019,22 @@
 
 	ast_mutex_lock(&sla.lock);
 
-	if (!AST_LIST_EMPTY(&sla.event_q))
+	if (!AST_LIST_EMPTY(&sla.event_q) || !AST_LIST_EMPTY(&sla.ringing_trunks) 
+		|| !AST_LIST_EMPTY(&sla.ringing_stations)) {
+		ast_mutex_unlock(&sla.lock);
 		return;
-	if (!AST_LIST_EMPTY(&sla.ringing_trunks))
-		return;
-	if (!AST_LIST_EMPTY(&sla.ringing_stations))
-		return;
-	
+	}
+
 	AST_RWLIST_RDLOCK(&sla_stations);
 	AST_RWLIST_TRAVERSE(&sla_stations, station, entry) {
 		if (station->ref_count)
 			break;
 	}
 	AST_RWLIST_UNLOCK(&sla_stations);
-	if (station)
+	if (station) {
+		ast_mutex_unlock(&sla.lock);
 		return;
+	}
 
 	AST_RWLIST_RDLOCK(&sla_trunks);
 	AST_RWLIST_TRAVERSE(&sla_trunks, trunk, entry) {
@@ -4041,8 +4042,10 @@
 			break;
 	}
 	AST_RWLIST_UNLOCK(&sla_trunks);
-	if (trunk)
+	if (trunk) {
+		ast_mutex_unlock(&sla.lock);
 		return;
+	}
 
 	/* yay */
 	sla_load_config(1);