[svn-commits] file: trunk r73320 - in /trunk: ./ channels/chan_local.c

[SVN commits to the Digium repositories]

Author: file
Date: Thu Jul  5 08:28:41 2007
New Revision: 73320

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

................
r73319 | file | 2007-07-05 10:27:40 -0300 (Thu, 05 Jul 2007) | 10 lines

Merged revisions 73318 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r73318 | file | 2007-07-05 10:26:02 -0300 (Thu, 05 Jul 2007) | 2 lines

Actually check to make sure a PBX was started on one of the Local channels instead of blindly assuming it was. (issue #10112 reported by makoto)

........

................

Modified:
    trunk/   (props changed)
    trunk/channels/chan_local.c

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

Modified: trunk/channels/chan_local.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_local.c?view=diff&rev=73320&r1=73319&r2=73320
==============================================================================
--- trunk/channels/chan_local.c (original)
+++ trunk/channels/chan_local.c Thu Jul  5 08:28:41 2007
@@ -474,10 +474,10 @@
 		}
 	}
 
-	ast_set_flag(p, LOCAL_LAUNCHED_PBX);
-
 	/* Start switch on sub channel */
-	res = ast_pbx_start(p->chan);
+	if (!(res = ast_pbx_start(p->chan)))
+		ast_set_flag(p, LOCAL_LAUNCHED_PBX);
+
 	ast_mutex_unlock(&p->lock);
 	return res;
 }