Fix compiler warnings

[grits] / src / plugins / elev.c

diff --git a/src/plugins/elev.c b/src/plugins/elev.c
index 6599964cbc1c23aa2a272171138637db824d95ab..a6589ff0b6aff8af717ea2055611a46d10abeca3 100644 (file)
--- a/src/plugins/elev.c
+++ b/src/plugins/elev.c
@@ -237,7 +237,6 @@ static gboolean _free_tile_cb(gpointer _data)
 }
 static void _free_tile(GisTile *tile, gpointer _elev)
 {
-       GisPluginElev *elev = _elev;
        g_debug("GisPluginElev: _free_tile: %p", tile->data);
        if (tile->data)
                g_idle_add_full(G_PRIORITY_LOW, _free_tile_cb, tile->data, NULL);
@@ -246,12 +245,12 @@ static void _free_tile(GisTile *tile, gpointer _elev)
 static gpointer _update_tiles(gpointer _elev)
 {
        GisPluginElev *elev = _elev;
-       g_mutex_lock(elev->mutex);
-       gdouble lat, lon, elevation;
-       gis_viewer_get_location(elev->viewer, &lat, &lon, &elevation);
-       gis_tile_update(elev->tiles,
+       if (!g_mutex_trylock(elev->mutex))
+               return NULL;
+       GisPoint eye;
+       gis_viewer_get_location(elev->viewer, &eye.lat, &eye.lon, &eye.elev);
+       gis_tile_update(elev->tiles, &eye,
                        MAX_RESOLUTION, TILE_WIDTH, TILE_WIDTH,
-                       lat, lon, elevation,
                        _load_tile, elev);
        gis_tile_gc(elev->tiles, time(NULL)-10,
                        _free_tile, elev);