revert a patch that wasn't supposed to be committed ... oops
authorRussell Bryant <russell@russellbryant.com>
Mon, 8 May 2006 21:07:12 +0000 (21:07 +0000)
committerRussell Bryant <russell@russellbryant.com>
Mon, 8 May 2006 21:07:12 +0000 (21:07 +0000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@25714 65c4cc65-6c06-0410-ace0-fbb531ad65f3

indications.c

index 996e43e..9b632de 100644 (file)
@@ -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");