Tighten up locking to allow for nested objects

[grits] / src / grits-opengl.c

diff --git a/src/grits-opengl.c b/src/grits-opengl.c
index a42cdab9bc8c966ef06250fa5f486cf05c44a95e..d8eda2752c7299cd33ba052c30869bedd6f2c118 100644 (file)
--- a/src/grits-opengl.c
+++ b/src/grits-opengl.c
@@ -414,16 +414,16 @@ static GritsObject *grits_opengl_remove(GritsViewer *_opengl, gpointer _link)
 {
        g_assert(GRITS_IS_OPENGL(_opengl));
        GritsOpenGL *opengl = GRITS_OPENGL(_opengl);
-       g_mutex_lock(opengl->objects_lock);
        GList *link = _link;
+       g_mutex_lock(opengl->objects_lock);
        GritsObject *object = link->data;
        /* Just unlink and free it, link->prev is assured */
        link->prev->next = link->next;
        if (link->next)
                link->next->prev = link->prev;
+       g_mutex_unlock(opengl->objects_lock);
        g_free(link);
        g_object_unref(object);
-       g_mutex_unlock(opengl->objects_lock);
        return object;
 }