[asterisk-commits] trunk r25714 - /trunk/indications.c

[asterisk-commits at lists.digium.com]

Author: russell
Date: Mon May  8 16:07:12 2006
New Revision: 25714

URL: http://svn.digium.com/view/asterisk?rev=25714&view=rev
Log:
revert a patch that wasn't supposed to be committed ... oops

Modified:
    trunk/indications.c

Modified: trunk/indications.c
URL: http://svn.digium.com/view/asterisk/trunk/indications.c?rev=25714&r1=25713&r2=25714&view=diff
==============================================================================
--- trunk/indications.c (original)
+++ trunk/indications.c Mon May  8 16:07:12 2006
@@ -412,13 +412,12 @@
 	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");