Keep a reference while iterating on a location

This avoids an unused variable declaration when the first argument is
NULL.

1 files changed, 14 insertions, 1 deletions

diff --git a/libgweather/gweather-location.c b/libgweather/gweather-location.c
index a5cfe40..26cc30b 100644
--- a/libgweather/gweather-location.c
+++ b/libgweather/gweather-location.c
@@ -647,7 +647,10 @@ find_nearest_city (GWeatherLocation *location,
 {
     struct FindNearestCityData *data = user_data;
 
-    double distance = location_distance (location->latitude, location->longitude, data->latitude, data->longitude);
+    double distance = location_distance (location->latitude,
+                                         location->longitude,
+                                         data->latitude,
+                                         data->longitude);
 
     if (data->location == NULL || data->distance > distance) {
         g_clear_pointer (&data->location, gweather_location_unref);
@@ -689,6 +692,8 @@ gweather_location_find_nearest_city (GWeatherLocation *loc,
 
     if (loc == NULL)
         loc = world = gweather_location_get_world ();
+    else
+        gweather_location_ref (loc);
 
     lat = lat * M_PI / 180.0;
     lon = lon * M_PI / 180.0;
@@ -700,6 +705,9 @@ gweather_location_find_nearest_city (GWeatherLocation *loc,
 
     foreach_city (loc, (GFunc) find_nearest_city, &data, NULL, NULL, NULL);
 
+    if (loc != world)
+        gweather_location_unref (loc);
+
     return data.location;
 }
 
@@ -745,6 +753,8 @@ gweather_location_find_nearest_city_full (GWeatherLocation *loc,
 
     if (loc == NULL)
         loc = world = gweather_location_get_world ();
+    else
+        gweather_location_ref (loc);
 
     lat = lat * M_PI / 180.0;
     lon = lon * M_PI / 180.0;
@@ -758,6 +768,9 @@ gweather_location_find_nearest_city_full (GWeatherLocation *loc,
 
     destroy (user_data);
 
+    if (loc != world)
+        gweather_location_unref (loc);
+
     return gweather_location_ref (data.location);
 }