[asterisk-commits] rmudgett: branch 10 r369239 - in /branches/10: ./ main/ccss.c

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Fri Jun 22 16:04:25 2012
New Revision: 369239

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

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

Modified:
    branches/10/   (props changed)
    branches/10/main/ccss.c

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

Modified: branches/10/main/ccss.c
URL: http://svnview.digium.com/svn/asterisk/branches/10/main/ccss.c?view=diff&rev=369239&r1=369238&r2=369239
==============================================================================
--- branches/10/main/ccss.c (original)
+++ branches/10/main/ccss.c Fri Jun 22 16:04:25 2012
@@ -2710,8 +2710,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;
 }