diff options
| author | seanbright <seanbright@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-05-27 13:04:10 +0000 |
|---|---|---|
| committer | seanbright <seanbright@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-05-27 13:04:10 +0000 |
| commit | 3bf4b31cdef86cf4c797f0cf173fa529bb6baa97 (patch) | |
| tree | 0ca10f22c05bfb926682abefaf3b357476ec30dc | |
| parent | 2a2f0d5add4b075cfe8c82b531091ce332eccaaa (diff) | |
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.
Before this change, when chan_alsa failed to load due to a missing or
inaccessible configuration file, no message would be displayed. With this
change, when chan_alsa fails to load due to a missing or inaccessible
configuration file, a message will be displayed.
(closes issue #14760)
Reported by: Nick_Lewis
Patches:
chan_alsa.c-confload.patch uploaded by Nick (license 657)
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@196989 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | channels/chan_alsa.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/channels/chan_alsa.c b/channels/chan_alsa.c index f3e3fea4a..2d30ba516 100644 --- a/channels/chan_alsa.c +++ b/channels/chan_alsa.c @@ -862,8 +862,10 @@ static int load_module(void) 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) { |