mirror of
https://github.com/asterisk/asterisk.git
synced 2025-10-22 04:43:50 +00:00
revert a patch that wasn't supposed to be committed ... oops
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@25714 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -412,13 +412,12 @@ struct tone_zone_sound *ast_get_indication_tone(const struct tone_zone *zone, co
|
||||
struct tone_zone_sound *ts;
|
||||
|
||||
/* we need some tonezone, pick the first */
|
||||
if (!zone) {
|
||||
if (current_tonezone)
|
||||
return current_tonezone; /* default country? */
|
||||
if (tone_zones)
|
||||
return tone_zones; /* any country? */
|
||||
return 0; /* not a single country insight */
|
||||
}
|
||||
if (zone == NULL && current_tonezone)
|
||||
zone = current_tonezone; /* default country? */
|
||||
if (zone == NULL && tone_zones)
|
||||
zone = tone_zones; /* any country? */
|
||||
if (zone == NULL)
|
||||
return 0; /* not a single country insight */
|
||||
|
||||
if (ast_mutex_lock(&tzlock)) {
|
||||
ast_log(LOG_WARNING, "Unable to lock tone_zones list\n");
|
||||
|
Reference in New Issue
Block a user