[svn-commits] seanbright: branch 1.6.0 r196989 - in /branches/1.6.0: ./ channels/chan_alsa.c

[SVN commits to the Digium repositories]

Author: seanbright
Date: Wed May 27 08:04:10 2009
New Revision: 196989

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=196989
Log:
Merged revisions 196988 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r196988 | seanbright | 2009-05-27 09:02:54 -0400 (Wed, 27 May 2009) | 9 lines
  
  Display an error message when chan_alsa fails to load due to a missing
  or inaccessible configuration file.  Small modification to the patch by
  me.
  
  (closes issue #14760)
  Reported by: Nick_Lewis
  Patches:
        chan_alsa.c-confload.patch uploaded by Nick (license 657)
........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/channels/chan_alsa.c

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

Modified: branches/1.6.0/channels/chan_alsa.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.0/channels/chan_alsa.c?view=diff&rev=196989&r1=196988&r2=196989
==============================================================================
--- branches/1.6.0/channels/chan_alsa.c (original)
+++ branches/1.6.0/channels/chan_alsa.c Wed May 27 08:04:10 2009
@@ -862,8 +862,10 @@
 
 	strcpy(mohinterpret, "default");
 
-	if (!(cfg = ast_config_load(config, config_flags)))
+	if (!(cfg = ast_config_load(config, config_flags))) {
+		ast_log(LOG_ERROR, "Unable to read ALSA configuration file %s.  Aborting.\n", config);
 		return AST_MODULE_LOAD_DECLINE;
+	}
 
 	v = ast_variable_browse(cfg, "general");
 	for (; v; v = v->next) {