[asterisk-commits] file: trunk r55950 - in /trunk: ./ apps/app_meetme.c

[asterisk-commits at lists.digium.com]

Author: file
Date: Wed Feb 21 14:18:16 2007
New Revision: 55950

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

........
r55949 | file | 2007-02-21 15:16:34 -0500 (Wed, 21 Feb 2007) | 2 lines

Only dispose of the conference if one was created.

........

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=55950&r1=55949&r2=55950
==============================================================================
--- trunk/apps/app_meetme.c (original)
+++ trunk/apps/app_meetme.c Wed Feb 21 14:18:16 2007
@@ -2546,8 +2546,10 @@
 					res = conf_run(chan, cnf, confflags.flags, optargs);
 				}
 			}
-			dispose_conf(cnf);
-			cnf = NULL;
+			if (cnf) {
+				dispose_conf(cnf);
+				cnf = NULL;
+			}
 		}
 	} while (allowretry);