[Asterisk-cvs] asterisk/channels chan_zap.c,1.508,1.509

[markster]

Update of /usr/cvsroot/asterisk/channels
In directory mongoose.digium.com:/tmp/cvs-serv23167/channels

Modified Files:
	chan_zap.c 
Log Message:
Try a more generally correct solution, for NFAS (bug #5179)


Index: chan_zap.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_zap.c,v
retrieving revision 1.508
retrieving revision 1.509
diff -u -d -r1.508 -r1.509
--- chan_zap.c	13 Sep 2005 02:20:37 -0000	1.508
+++ chan_zap.c	13 Sep 2005 02:27:32 -0000	1.509
@@ -2205,8 +2205,6 @@
 		ast_log(LOG_NOTICE, "Switching from from d-channel %d to channel %d!\n",
 			pri->dchannels[oldslot], pri->dchannels[newslot]);
 	pri->pri = pri->dchans[newslot];
-	if (!pri_is_up(pri) && !(pri->dchanavail[newslot] & DCHAN_NOTINALARM))
-		pri_restart(pri->dchans[newslot]);
 	return 0;
 }
 #endif
@@ -8067,7 +8065,7 @@
 						pri_find_dchan(pri);
 					} else if (x == ZT_EVENT_NOALARM) {
 						pri->dchanavail[which] |= DCHAN_NOTINALARM;
-						pri_find_dchan(pri);
+						pri_restart(pri->dchans[which]);
 					}
 				
 					if (option_debug)