166a167,169
> 
> 	/* If marked user exits, continue conference */
> 	CONFFLAG_CONTINUE_IF_MARKEDEXITS = (1 << 28),
200a204,205
> 
> 	AST_APP_OPTION('C', CONFFLAG_CONTINUE_IF_MARKEDEXITS ),
344a350
> 	int ignoremarked;
1421c1427
< 	if ((confflags & CONFFLAG_WAITMARKED) &&
---
> 	if (!conf->ignoremarked && (confflags & CONFFLAG_WAITMARKED) &&
1540c1546
< 		if ((confflags & CONFFLAG_WAITMARKED) && conf->markedusers == 0)
---
> 		if (!conf->ignoremarked && (confflags & CONFFLAG_WAITMARKED) && conf->markedusers == 0)
1680c1686
< 	if (confflags & CONFFLAG_WAITMARKED && !conf->markedusers)
---
> 	if (!conf->ignoremarked && confflags & CONFFLAG_WAITMARKED && !conf->markedusers)
1774a1781
> 			    !conf->ignoremarked &&
1797,1798c1804,1805
< 			
< 			if (confflags & CONFFLAG_WAITMARKED) {
---
> 
> 			if (!conf->ignoremarked && (confflags & CONFFLAG_WAITMARKED)) {
1859c1866,1870
< 			
---
> 
> 			if (currentmarked == 0 && lastmarked != 0 && (confflags & CONFFLAG_CONTINUE_IF_MARKEDEXITS)) {
> 				conf->ignoremarked = 1;
> 			}
> 			else {
1864a1876
> 			}
2313c2325
< 			if (confflags & CONFFLAG_MARKEDUSER) 
---
> 			if (confflags & CONFFLAG_MARKEDUSER) {
2314a2327
> 			}