[svn-commits] rmudgett: trunk r381069 - in /trunk: ./ apps/app_confbridge.c

[SVN commits to the Digium repositories]

Author: rmudgett
Date: Fri Feb  8 11:37:27 2013
New Revision: 381069

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=381069
Log:
app_confbridge: Fix crash from receiving an AMI action after ConfBridge unloaded.

Unloading ConfBridge caused the next AMI action received to crash
Asterisk.

* Add the missing unregister of AMI action ConfbridgeSetSingleVideoSrc
when ConfBridge is unloaded.

(closes issue ASTERISK-20994)
Reported by: Jeremy Kister
Patches:
      jira_asterisk_20994_v11.patch (license #5621) patch uploaded by rmudgett
Tested by: Rusty Newton, Jeremy Kister
........

Merged revisions 381067 from http://svn.asterisk.org/svn/asterisk/branches/11

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

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

Modified: trunk/apps/app_confbridge.c
URL: http://svnview.digium.com/svn/asterisk/trunk/apps/app_confbridge.c?view=diff&rev=381069&r1=381068&r2=381069
==============================================================================
--- trunk/apps/app_confbridge.c (original)
+++ trunk/apps/app_confbridge.c Fri Feb  8 11:37:27 2013
@@ -2995,6 +2995,7 @@
 	res |= ast_manager_unregister("ConfbridgeLock");
 	res |= ast_manager_unregister("ConfbridgeStartRecord");
 	res |= ast_manager_unregister("ConfbridgeStopRecord");
+	res |= ast_manager_unregister("ConfbridgeSetSingleVideoSrc");
 
 	return res;
 }