diff options
author | Russell Bryant <russell@russellbryant.com> | 2006-05-08 21:07:12 +0000 |
---|---|---|
committer | Russell Bryant <russell@russellbryant.com> | 2006-05-08 21:07:12 +0000 |
commit | 92fb3ef88953f7f8e9445b41a035891dd7680249 (patch) | |
tree | 02e1702c3654533db613142fec639e6c40d5b996 /indications.c | |
parent | 962d53732a6cf46a0791131d71d24ce06aad1688 (diff) |
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
Diffstat (limited to 'indications.c')
-rw-r--r-- | indications.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/indications.c b/indications.c index 996e43e86..9b632de98 100644 --- a/indications.c +++ b/indications.c @@ -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"); |