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 3f984a805ed39c4734db81b7f088c27ec0cef68f..cef4fa53c59d0639340b35aecff2d4215441366a 100644 (file)
--- 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 7632f36ee693aed3075b56dc967259e27f9d76dc..0e60941faaab3038c068d879587c9f097ff00d0a 100644 (file)
--- 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 */