Miscellaneous bug fixes

[grits] / src / plugins / sat.c

diff --git a/src/plugins/sat.c b/src/plugins/sat.c
index fae0c37044cb42c23cb9f508f2919a3156f74cb6..5dc3c851e21499bf717e2f166e8e18e22dd35377 100644 (file)
--- a/src/plugins/sat.c
+++ b/src/plugins/sat.c
@@ -117,20 +117,21 @@ static gboolean _free_tile_cb(gpointer data)
 static void _free_tile(GisTile *tile, gpointer _sat)
 {
        GisPluginSat *sat = _sat;
-       g_debug("GisPluginSat: _free_tile: %p=%d", tile->data, *(guint*)tile->data);
-       g_idle_add_full(G_PRIORITY_LOW, _free_tile_cb, tile->data, NULL);
+       g_debug("GisPluginSat: _free_tile: %p", tile->data);
+       if (tile->data)
+               g_idle_add_full(G_PRIORITY_LOW, _free_tile_cb, tile->data, NULL);
 }
 
 static gpointer _update_tiles(gpointer _sat)
 {
        g_debug("GisPluginSat: _update_tiles");
        GisPluginSat *sat = _sat;
-       g_mutex_lock(sat->mutex);
-       gdouble lat, lon, elev;
-       gis_viewer_get_location(sat->viewer, &lat, &lon, &elev);
-       gis_tile_update(sat->tiles,
+       if (!g_mutex_trylock(sat->mutex))
+               return NULL;
+       GisPoint eye;
+       gis_viewer_get_location(sat->viewer, &eye.lat, &eye.lon, &eye.elev);
+       gis_tile_update(sat->tiles, &eye,
                        MAX_RESOLUTION, TILE_WIDTH, TILE_WIDTH,
-                       lat, lon, elev,
                        _load_tile, sat);
        gis_tile_gc(sat->tiles, time(NULL)-10,
                        _free_tile, sat);
@@ -179,7 +180,7 @@ GisPluginSat *gis_plugin_sat_new(GisViewer *viewer)
                        G_CALLBACK(_on_location_changed), sat);
 
        /* Add renderers */
-       gis_viewer_add(viewer, GIS_OBJECT(sat->tiles), GIS_LEVEL_WORLD, 0);
+       gis_viewer_add(viewer, GIS_OBJECT(sat->tiles), GIS_LEVEL_WORLD, FALSE);
 
        return sat;
 }