[asterisk-commits] seanbright: branch 1.6.2 r304773 - /branches/1.6.2/apps/app_meetme.c

[SVN commits to the Asterisk project]

Author: seanbright
Date: Sat Jan 29 11:51:28 2011
New Revision: 304773

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=304773
Log:
When we pass the S() or L() options to MeetMe, make sure that we honor C as well.

Without this patch, if the user was kicked from the conference via the S() or L()
mechanism, we would just hang up on them even if we also passed C (continue in
dialplan when kicked).  With this patch we honor the C flag in those cases.

(closes issue #17317)
Reported by: var

Modified:
    branches/1.6.2/apps/app_meetme.c

Modified: branches/1.6.2/apps/app_meetme.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/apps/app_meetme.c?view=diff&rev=304773&r1=304772&r2=304773
==============================================================================
--- branches/1.6.2/apps/app_meetme.c (original)
+++ branches/1.6.2/apps/app_meetme.c Sat Jan 29 11:51:28 2011
@@ -2649,6 +2649,11 @@
 			}
 
  			if (user->kicktime && (user->kicktime <= now.tv_sec)) {
+				if (confflags & CONFFLAG_KICK_CONTINUE) {
+					ret = 0;
+				} else {
+					ret = -1;
+				}
 				break;
 			}
   
@@ -2719,6 +2724,11 @@
 
 			now = ast_tvnow();
 			if (timeout && now.tv_sec >= timeout) {
+				if (confflags & CONFFLAG_KICK_CONTINUE) {
+					ret = 0;
+				} else {
+					ret = -1;
+				}
 				break;
 			}