[svn-commits] russell: trunk r60070 - in /trunk: ./ apps/app_meetme.c

[svn-commits at lists.digium.com]

Author: russell
Date: Wed Apr  4 11:27:12 2007
New Revision: 60070

URL: http://svn.digium.com/view/asterisk?view=rev&rev=60070
Log:
Merged revisions 60069 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r60069 | russell | 2007-04-04 11:26:23 -0500 (Wed, 04 Apr 2007) | 4 lines

Fix a problem where if a trunk was hung up while it was on hold, all of the
hints would reflect the line still on hold, even though it should reflect that
it is back to not in use.  (issue #9459, reported by francesco_r, fixed by me)

........

Modified:
    trunk/   (props changed)
    trunk/apps/app_meetme.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/apps/app_meetme.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_meetme.c?view=diff&rev=60070&r1=60069&r2=60070
==============================================================================
--- trunk/apps/app_meetme.c (original)
+++ trunk/apps/app_meetme.c Wed Apr  4 11:27:12 2007
@@ -4049,6 +4049,9 @@
 		conf = NULL;
 	}
 
+	/* If the trunk is going away, it is definitely now IDLE. */
+	sla_change_trunk_state(trunk_ref->trunk, SLA_TRUNK_STATE_IDLE, ALL_TRUNK_REFS, NULL);
+
 	trunk_ref->trunk->chan = NULL;
 
 	ast_dial_join(dial);