mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-30 10:33:13 +00:00
file.c: with "sounds_search_custom_dir = yes", search "custom" directory
With `sounds_search_custom_dir = yes`, we are supposed to search for sounds
in the `AST_DATA_DIR/sounds/custom` directory before searching the normal
directories. Unfortunately, a recent change
(https://github.com/asterisk/asterisk/pull/1172) had a typo resulting in
the "custom" directory not being searched. This change restores this
expected behavior.
Resolves: #1353
(cherry picked from commit 80fd650881
)
This commit is contained in:
committed by
George Joseph
parent
8624ed58df
commit
eb1c2ca6e3
@@ -1327,7 +1327,7 @@ int ast_streamfile(struct ast_channel *chan, const char *filename,
|
||||
if (ast_opt_sounds_search_custom && !is_absolute_path(filename)) {
|
||||
memset(custom_filename, 0, sizeof(custom_filename));
|
||||
snprintf(custom_filename, sizeof(custom_filename), "custom/%s", filename);
|
||||
fs = openstream_internal(chan, filename, preflang, 0, 1); /* open stream, do not warn for missing files */
|
||||
fs = openstream_internal(chan, custom_filename, preflang, 0, 1); /* open stream, do not warn for missing files */
|
||||
if (fs) {
|
||||
tmp_filename = custom_filename;
|
||||
ast_debug(3, "Found file %s in custom directory\n", filename);
|
||||
|
Reference in New Issue
Block a user