[Asterisk-cvs] asterisk/channels chan_zap.c,1.310,1.311

[markster at lists.digium.com]

Update of /usr/cvsroot/asterisk/channels
In directory localhost.localdomain:/tmp/cvs-serv19556/channels

Modified Files:
	chan_zap.c 
Log Message:
Fix "ZapOffHook" (bug #2161)


Index: chan_zap.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_zap.c,v
retrieving revision 1.310
retrieving revision 1.311
diff -u -d -r1.310 -r1.311
--- chan_zap.c	27 Jul 2004 02:19:52 -0000	1.310
+++ chan_zap.c	28 Jul 2004 18:38:29 -0000	1.311
@@ -8423,14 +8423,14 @@
 		return 0;
 	}
 	p = find_channel(atoi(channel));
-	if (!p->owner) {
-		astman_send_error(s, m, "Channel does not have it's owner");
-		return 0;
-	}
 	if (!p) {
 		astman_send_error(s, m, "No such channel");
 		return 0;
 	}
+	if (!p->owner) {
+		astman_send_error(s, m, "Channel does not have it's owner");
+		return 0;
+	}
 	for (i=0; i<strlen(number); i++) {
 		struct ast_frame f = { AST_FRAME_DTMF, number[i] };
 		zap_queue_frame(p, &f);