[asterisk-commits] russell: trunk r55952 - in /trunk: ./ apps/app_meetme.c

[asterisk-commits at lists.digium.com]

Author: russell
Date: Wed Feb 21 14:23:03 2007
New Revision: 55952

URL: http://svn.digium.com/view/asterisk?view=rev&rev=55952
Log:
Merged revisions 55951 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r55951 | russell | 2007-02-21 14:22:33 -0600 (Wed, 21 Feb 2007) | 3 lines

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:
    trunk/   (props changed)
    trunk/apps/app_meetme.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

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