[asterisk-commits] rmudgett: trunk r378691 - in /trunk: ./ apps/app_queue.c

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Tue Jan  8 18:05:35 2013
New Revision: 378691

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=378691
Log:
app_queue: Fix incorrect assertion.

(issue ASTERISK-16115)
........

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

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

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

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

Modified: trunk/apps/app_queue.c
URL: http://svnview.digium.com/svn/asterisk/trunk/apps/app_queue.c?view=diff&rev=378691&r1=378690&r2=378691
==============================================================================
--- trunk/apps/app_queue.c (original)
+++ trunk/apps/app_queue.c Tue Jan  8 18:05:35 2013
@@ -3624,7 +3624,7 @@
 		++*busies;
 		return 0;
 	}
-	ast_assert(qe->parent->ringinuse || tmp->member->call_pending);
+	ast_assert(tmp->member->ringinuse || tmp->member->call_pending);
 
 	ast_copy_string(tech, tmp->interface, sizeof(tech));
 	if ((location = strchr(tech, '/'))) {