[Asterisk-cvs] zaptel zaptel.c,1.91,1.92

[markster at lists.digium.com]

Update of /usr/cvsroot/zaptel
In directory mongoose.digium.com:/tmp/cvs-serv12678

Modified Files:
	zaptel.c 
Log Message:
Handle unload with digitalmon properly (bug #2299)


Index: zaptel.c
===================================================================
RCS file: /usr/cvsroot/zaptel/zaptel.c,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -d -r1.91 -r1.92
--- zaptel.c	21 Aug 2004 21:34:58 -0000	1.91
+++ zaptel.c	25 Aug 2004 16:31:06 -0000	1.92
@@ -1545,8 +1545,9 @@
 				chans[x]->master = chans[x];
 			}
 			if ((chans[x]->confna == chan->channo) &&
-				(chans[x]->confmode >= ZT_CONF_MONITOR) &&
-				(chans[x]->confmode <= ZT_CONF_MONITORBOTH)) {
+				(((chans[x]->confmode >= ZT_CONF_MONITOR) &&
+				(chans[x]->confmode <= ZT_CONF_MONITORBOTH)) ||
+				(chans[x]->confmode == ZT_CONF_DIGITALMON))) {
 				/* Take them out of conference with us */
 				/* release conference resource if any */
 				if (chans[x]->confna)
@@ -4613,6 +4614,8 @@
 			break;
 		case ZT_CONF_DIGITALMON:
 			/* Real digital monitoring, but still echo cancel if desired */
+			if (!chans[ms->confna])
+				break;
 			if (chans[ms->confna]->flags & ZT_FLAG_PSEUDO) {
 				if (ms->ec) {
 					for (x=0;x<ZT_CHUNKSIZE;x++)