Implement temporary work around for pseudo channels with SMP

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

diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index a497807..4e86a26 100755 (executable)
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -482,6 +482,19 @@ zapretry:
                }
        }
 
+#ifndef NO_ZAPTEL_PANIC_WORKAROUND
+       /* Take out of conference */
+       /* Add us to the conference */
+       ztc.chan = 0;   
+       ztc.confno = 0;
+       ztc.confmode = 0;
+       if (ioctl(fd, ZT_SETCONF, &ztc)) {
+               ast_log(LOG_WARNING, "Error setting conference\n");
+       }
+       usleep(1);
+       if (fd != chan->fds[0])
+               close(fd);
+#else          
        if (fd != chan->fds[0])
                close(fd);
        else {
@@ -494,7 +507,7 @@ zapretry:
                        ast_log(LOG_WARNING, "Error setting conference\n");
                }
        }
-
+#endif
        if (!(confflags & CONFFLAG_QUIET) && !(confflags & CONFFLAG_MONITOR) && !(confflags & CONFFLAG_ADMIN))
                conf_play(conf, LEAVE);