revert a patch that wasn't supposed to be committed ... oops

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@25714 f38db490-d61c-443f-a65b-d21fe96a405b

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");