Fix CIDCW for non-native calls only

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@1158 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index 376d5e6..6b96a19 100755 (executable)
--- a/channels/chan_zap.c
+++ b/channels/chan_zap.c
@@ -3267,7 +3267,8 @@ struct ast_frame  *zt_read(struct ast_channel *ast)
                                        free(p->cidspill);
                                send_cwcidspill(p);
                        }
-                       p->callwaitcas = 0;
+                       if ((f->subclass != 'm') && (f->subclass != 'u')) 
+                               p->callwaitcas = 0;
                        p->subs[index].f.frametype = AST_FRAME_NULL;
                        p->subs[index].f.subclass = 0;
                        f = &p->subs[index].f;