From 92fb3ef88953f7f8e9445b41a035891dd7680249 Mon Sep 17 00:00:00 2001
From: Russell Bryant <russell@russellbryant.com>
Date: Mon, 8 May 2006 21:07:12 +0000
Subject: [PATCH] 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
---
indications.c | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/indications.c b/indications.c
index 996e43e867..9b632de98a 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");
--
GitLab