Misc pointer fixes

[grits] / src / plugins / elev.c

diff --git a/src/plugins/elev.c b/src/plugins/elev.c
index 65f3b828bbd195e3c238cadbfdfe78f3d006f603..d8ffc009e338c8d084352e85d902832cf993e831 100644 (file)
--- a/src/plugins/elev.c
+++ b/src/plugins/elev.c
@@ -195,7 +195,7 @@ static void _load_tile(GisTile *tile, gpointer _self)
        GisPluginElev *self = _self;
 
        struct _LoadTileData *load = g_new0(struct _LoadTileData, 1);
-       load->path = gis_wms_make_local(self->wms, tile);
+       load->path = gis_wms_fetch(self->wms, tile, GIS_ONCE, NULL, NULL);
        g_debug("GisPluginElev: _load_tile: %s", load->path);
        load->self = self;
        load->tile = tile;
@@ -204,6 +204,7 @@ static void _load_tile(GisTile *tile, gpointer _self)
                load->data->bil = _load_bil(load->path);
                if (!load->data->bil) {
                        g_remove(load->path);
+                       g_free(load->data);
                        g_free(load->path);
                        g_free(load);
                        return;
@@ -230,7 +231,8 @@ static void _free_tile(GisTile *tile, gpointer _self)
 {
        GisPluginElev *self = _self;
        g_debug("GisPluginElev: _free_tile: %p", tile->data);
-       g_idle_add_full(G_PRIORITY_LOW, _free_tile_cb, tile->data, NULL);
+       if (tile->data)
+               g_idle_add_full(G_PRIORITY_LOW, _free_tile_cb, tile->data, NULL);
 }
 
 static gpointer _update_tiles(gpointer _self)