[asterisk-commits] russell: branch 1.4 r55951 - /branches/1.4/apps/app_meetme.c

[asterisk-commits at lists.digium.com]

Author: russell
Date: Wed Feb 21 14:22:33 2007
New Revision: 55951

URL: http://svn.digium.com/view/asterisk?view=rev&rev=55951
Log:
Simplify the last change to app_meetme, and move the call to dispose_conf()
up into the block where we know a conf exists.

Modified:
    branches/1.4/apps/app_meetme.c

Modified: branches/1.4/apps/app_meetme.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/apps/app_meetme.c?view=diff&rev=55951&r1=55950&r2=55951
==============================================================================
--- branches/1.4/apps/app_meetme.c (original)
+++ branches/1.4/apps/app_meetme.c Wed Feb 21 14:22:33 2007
@@ -2536,8 +2536,6 @@
 					/* Run the conference */
 					res = conf_run(chan, cnf, confflags.flags, optargs);
 				}
-			}
-			if (cnf) {
 				dispose_conf(cnf);
 				cnf = NULL;
 			}