From: Automerge script <automerge@asterisk.org>
Date: Tue, 30 Oct 2012 19:24:15 +0000 (+0000)
Subject: Merged revisions 375485,375496 via svnmerge from
X-Git-Tag: 10.11.0-digiumphones-rc1~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6181402839c06c3881c0270155b11389a091d212;p=thirdparty%2Fasterisk.git

Merged revisions 375485,375496 via svnmerge from
file:///srv/subversion/repos/asterisk/branches/10

................
  r375485 | jrose | 2012-10-30 13:55:58 -0500 (Tue, 30 Oct 2012) | 8 lines

  mixmonitor: Add a test event

  This test event is being used to fix the  mixmonitor_audiohook_inherit
  test.
  ........

  Merged revisions 375484 from http://svn.asterisk.org/svn/asterisk/branches/1.8
................
  r375496 | rmudgett | 2012-10-30 14:20:28 -0500 (Tue, 30 Oct 2012) | 8 lines

  Fix ConfBridge crash if no timing module loaded.

  (closes issue ASTERISK-19448)
  Reported by: feyfre
  Patches:
        smfix.patch (license #6099) patch uploaded by feyfre
        Modified for coding guidelines.
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/10-digiumphones@375510 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/apps/app_mixmonitor.c b/apps/app_mixmonitor.c
index 3f984a805e..cef4fa53c5 100644
--- a/apps/app_mixmonitor.c
+++ b/apps/app_mixmonitor.c
@@ -54,6 +54,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/manager.h"
 #include "asterisk/callerid.h"
 #include "asterisk/mod_format.h"
+#include "asterisk/test.h"
 
 /*** DOCUMENTATION
 	<application name="MixMonitor" language="en_US">
@@ -671,6 +672,13 @@ static void *mixmonitor_thread(void *obj)
 
 		ast_audiohook_lock(&mixmonitor->audiohook);
 	}
+
+	/* Test Event */
+	ast_test_suite_event_notify("MIXMONITOR_END", "Channel: %s\r\n"
+									"File: %s\r\n",
+									mixmonitor->autochan->chan->name,
+									mixmonitor->filename);
+
 	ast_audiohook_unlock(&mixmonitor->audiohook);
 
 	ast_autochan_destroy(mixmonitor->autochan);
diff --git a/bridges/bridge_softmix.c b/bridges/bridge_softmix.c
index 7632f36ee6..0e60941faa 100644
--- a/bridges/bridge_softmix.c
+++ b/bridges/bridge_softmix.c
@@ -297,7 +297,10 @@ static void softmix_translate_helper_cleanup(struct softmix_translate_helper *tr
 static void softmix_bridge_data_destroy(void *obj)
 {
 	struct softmix_bridge_data *softmix_data = obj;
-	ast_timer_close(softmix_data->timer);
+
+	if (softmix_data->timer) {
+		ast_timer_close(softmix_data->timer);
+	}
 }
 
 /*! \brief Function called when a bridge is created */