Reentrant dispose functions for sat and map

[grits] / src / plugins / sat.c

diff --git a/src/plugins/sat.c b/src/plugins/sat.c
index 1c738d90c620ad0f31caacb65b567bee71b1e20a..0d4f0cb26f0f20af02eab00664f54302b40e40c1 100644 (file)
--- a/src/plugins/sat.c
+++ b/src/plugins/sat.c
@@ -219,14 +219,15 @@ static void grits_plugin_sat_dispose(GObject *gobject)
        sat->aborted = TRUE;
        /* Drop references */
        if (sat->viewer) {
-               g_signal_handler_disconnect(sat->viewer, sat->sigid);
-               grits_viewer_remove(sat->viewer, GRITS_OBJECT(sat->tiles));
+               GritsViewer *viewer = sat->viewer;
+               sat->viewer = NULL;
+               g_signal_handler_disconnect(viewer, sat->sigid);
+               grits_viewer_remove(viewer, GRITS_OBJECT(sat->tiles));
                soup_session_abort(sat->wms->http->soup);
                g_thread_pool_free(sat->threads, TRUE, TRUE);
                while (gtk_events_pending())
                        gtk_main_iteration();
-               g_object_unref(sat->viewer);
-               sat->viewer = NULL;
+               g_object_unref(viewer);
        }
        G_OBJECT_CLASS(grits_plugin_sat_parent_class)->dispose(gobject);
 }