[svn-commits] tilghman: branch 1.6.0 r247842 - in /branches/1.6.0: ./ res/res_speech.c

[SVN commits to the Digium repositories]

Author: tilghman
Date: Thu Feb 18 17:15:03 2010
New Revision: 247842

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=247842
Log:
Merged revisions 247841 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r247841 | tilghman | 2010-02-18 17:13:46 -0600 (Thu, 18 Feb 2010) | 7 lines
  
  Revert an errant part of a previous cleanup, to fix a memory corruption issue.
  
  (closes issue #16368)
   Reported by: thirionjwf
   Patches: 
         res_speech.c.patch uploaded by thirionjwf (license 955)
........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/res/res_speech.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/res/res_speech.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.0/res/res_speech.c?view=diff&rev=247842&r1=247841&r2=247842
==============================================================================
--- branches/1.6.0/res/res_speech.c (original)
+++ branches/1.6.0/res/res_speech.c Thu Feb 18 17:15:03 2010
@@ -313,8 +313,9 @@
 			/* We have our engine... removed it */
 			AST_RWLIST_REMOVE_CURRENT(list);
 			/* If this was the default engine, we need to pick a new one */
-			if (!default_engine)
+			if (engine == default_engine) {
 				default_engine = AST_RWLIST_FIRST(&engines);
+			}
 			ast_verb(2, "Unregistered speech recognition engine '%s'\n", engine_name);
 			/* All went well */
 			res = 0;