[asterisk-commits] russell: branch russell/sla_rewrite r53528 - /team/russell/sla_rewrite/apps/

[asterisk-commits at lists.digium.com]

Author: russell
Date: Wed Feb  7 18:50:52 2007
New Revision: 53528

URL: http://svn.digium.com/view/asterisk?view=rev&rev=53528
Log:
Fix a couple of buglets found while testing HOLD support.

I think HOLD support is working.  However, it is hard to tell completely,
because the phones I am using for testing don't support showing HOLD on
their blinky lights.

I will test will some phones that suck less tomorrow ...

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

Modified: team/russell/sla_rewrite/apps/app_meetme.c
URL: http://svn.digium.com/view/asterisk/team/russell/sla_rewrite/apps/app_meetme.c?view=diff&rev=53528&r1=53527&r2=53528
==============================================================================
--- team/russell/sla_rewrite/apps/app_meetme.c (original)
+++ team/russell/sla_rewrite/apps/app_meetme.c Wed Feb  7 18:50:52 2007
@@ -1113,6 +1113,7 @@
 			if (!strcmp(trunk_ref->trunk->name, trunk_name))
 				break;
 		}
+		break;
 	}
 	AST_RWLIST_UNLOCK(&sla_stations);
 
@@ -3048,7 +3049,7 @@
 				ast_log(LOG_DEBUG, "UNHOLD, station: %s  trunk: %s\n", 
 					event->station->name, event->trunk_ref->trunk->name);
 				if (ast_atomic_dec_and_test((int *) &event->trunk_ref->trunk->hold_stations) == 1)
-					change_trunk_state(trunk_ref->trunk, SLA_TRUNK_STATE_UP);
+					change_trunk_state(event->trunk_ref->trunk, SLA_TRUNK_STATE_UP);
 				else {
 					event->trunk_ref->state = SLA_TRUNK_STATE_UP;
 					ast_device_state_changed("SLA:%s_%s",