Fix pointer/loading bugs in RadarSite hiding

diff --git a/src/plugins/level2.c b/src/plugins/level2.c
index 5156b70065a9f794672ec5a6125e4d0acd8fbf6d..180aea33bad9e23eb22cda902799f6c6eaefbb5c 100644 (file)
--- a/src/plugins/level2.c
+++ b/src/plugins/level2.c
@@ -258,7 +258,9 @@ AWeatherLevel2 *aweather_level2_new_from_file(GisViewer *viewer,
 
        /* Load the radar file */
        RSL_read_these_sweeps("all", NULL);
 
        /* Load the radar file */
        RSL_read_these_sweeps("all", NULL);

+       g_message("read start");

        Radar *radar = RSL_wsr88d_to_radar(raw, (gchar*)site);
        Radar *radar = RSL_wsr88d_to_radar(raw, (gchar*)site);

+       g_message("read done");

        g_free(raw);
        if (!radar)
                return NULL;
        g_free(raw);
        if (!radar)
                return NULL;

diff --git a/src/plugins/radar.c b/src/plugins/radar.c
index 171267c1fe54bc0ff1b73e94a4e4bcb0955447f1..a4ed00479bc19b5713505f7d310ae7a88d058e50 100644 (file)
--- a/src/plugins/radar.c
+++ b/src/plugins/radar.c
@@ -147,7 +147,6 @@ gpointer _site_update_thread(gpointer _site)
 {
        RadarSite *site = _site;
        g_debug("GisPluginRadar: _site_update_thread - %s", site->city->code);
 {
        RadarSite *site = _site;
        g_debug("GisPluginRadar: _site_update_thread - %s", site->city->code);

-       site->status = STATUS_LOADING;

        site->message = NULL;
 
        gboolean offline = gis_viewer_get_offline(site->viewer);
        site->message = NULL;
 
        gboolean offline = gis_viewer_get_offline(site->viewer);


@@ -190,12 +189,12 @@ gpointer _site_update_thread(gpointer _site)
        g_debug("GisPluginRadar: _site_update_thread - load - %s", site->city->code);
        site->level2 = aweather_level2_new_from_file(
                        site->viewer, colormaps, file, site->city->code);
        g_debug("GisPluginRadar: _site_update_thread - load - %s", site->city->code);
        site->level2 = aweather_level2_new_from_file(
                        site->viewer, colormaps, file, site->city->code);

-       GIS_OBJECT(site->level2)->hidden = site->hidden;

        g_free(file);
        if (!site->level2) {
                site->message = "Load failed";
                goto out;
        }
        g_free(file);
        if (!site->level2) {
                site->message = "Load failed";
                goto out;
        }

+       GIS_OBJECT(site->level2)->hidden = site->hidden;

        site->level2_ref = gis_viewer_add(site->viewer,
                        GIS_OBJECT(site->level2), GIS_LEVEL_WORLD, TRUE);
 
        site->level2_ref = gis_viewer_add(site->viewer,
                        GIS_OBJECT(site->level2), GIS_LEVEL_WORLD, TRUE);
 


@@ -205,6 +204,10 @@ out:
 }
 void _site_update(RadarSite *site)
 {
 }
 void _site_update(RadarSite *site)
 {

+       if (site->status == STATUS_LOADING)
+               return;
+       site->status = STATUS_LOADING;
+

        site->time = gis_viewer_get_time(site->viewer);
        g_debug("GisPluginRadar: _site_update %s - %d",
                        site->city->code, (gint)site->time);
        site->time = gis_viewer_get_time(site->viewer);
        g_debug("GisPluginRadar: _site_update %s - %d",
                        site->city->code, (gint)site->time);


@@ -264,7 +267,6 @@ void radar_site_toggle(RadarSite *site)
 void radar_site_load(RadarSite *site)
 {
        g_debug("GisPluginRadar: radar_site_load %s", site->city->code);
 void radar_site_load(RadarSite *site)
 {
        g_debug("GisPluginRadar: radar_site_load %s", site->city->code);

-       site->status = STATUS_LOADING;

 
        /* Add tab page */
        site->config = gtk_alignment_new(0, 0, 1, 1);
 
        /* Add tab page */
        site->config = gtk_alignment_new(0, 0, 1, 1);