[svn-commits] rmudgett: trunk r369240 - in /trunk: ./ main/ccss.c

[SVN commits to the Digium repositories]

Author: rmudgett
Date: Fri Jun 22 16:06:36 2012
New Revision: 369240

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=369240
Log:
Check if PBX was started for generic CCSS recall.
........

Merged revisions 369238 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 369239 from http://svn.asterisk.org/svn/asterisk/branches/10

Modified:
    trunk/   (props changed)
    trunk/main/ccss.c

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

Modified: trunk/main/ccss.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/ccss.c?view=diff&rev=369240&r1=369239&r2=369240
==============================================================================
--- trunk/main/ccss.c (original)
+++ trunk/main/ccss.c Fri Jun 22 16:06:36 2012
@@ -2744,8 +2744,13 @@
 			return NULL;
 		}
 	}
-	ast_cc_agent_recalling(agent->core_id, "Generic agent %s is recalling", agent->device_name);
-	ast_pbx_start(chan);
+	if (ast_pbx_start(chan)) {
+		ast_cc_failed(agent->core_id, "PBX failed to start for %s.", agent->device_name);
+		ast_hangup(chan);
+		return NULL;
+	}
+	ast_cc_agent_recalling(agent->core_id, "Generic agent %s is recalling",
+		agent->device_name);
 	return NULL;
 }