From: Joshua Colp <jcolp@digium.com>
Date: Wed, 21 Feb 2007 20:18:16 +0000 (+0000)
Subject: Merged revisions 55949 via svnmerge from
X-Git-Tag: 1.6.0-beta1~3^2~3146
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=80e8ca4f9bafddd7e3c6a4ebd2ee31562406213e;p=thirdparty%2Fasterisk.git

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.

........


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

diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index 502cb94f1b..7a394f20dd 100644
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -2546,8 +2546,10 @@ static int conf_exec(struct ast_channel *chan, void *data)
 					res = conf_run(chan, cnf, confflags.flags, optargs);
 				}
 			}
-			dispose_conf(cnf);
-			cnf = NULL;
+			if (cnf) {
+				dispose_conf(cnf);
+				cnf = NULL;
+			}
 		}
 	} while (allowretry);