mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-22 08:17:01 +00:00
Code Issues 1 Projects Releases Wiki Activity

gtk: separate out the widget/window destroy callbacks

Browse source 
Fixes assertion due to the sink_finalize() being run before the widget destroy
callback.

https://bugzilla.gnome.org/show_bug.cgi?id=755969
This commit is contained in:
Matthew Waters 2015-10-17 02:40:50 +11:00
parent f0a0fcb0bf
commit cfff5d819e
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
ext/gtk/gstgtkbasesink.c
View file

@ -152,12 +152,15 @@ static void
widget_destroy_cb (GtkWidget * widget, GstGtkBaseSink * gtk_sink) widget_destroy_cb (GtkWidget * widget, GstGtkBaseSink * gtk_sink)
{ {
GST_OBJECT_LOCK (gtk_sink); GST_OBJECT_LOCK (gtk_sink);
if (widget == GTK_WIDGET (gtk_sink->widget))
g_clear_object (&gtk_sink->widget); g_clear_object (&gtk_sink->widget);
else if (widget == gtk_sink->window) GST_OBJECT_UNLOCK (gtk_sink);
}
static void
window_destroy_cb (GtkWidget * widget, GstGtkBaseSink * gtk_sink)
{
GST_OBJECT_LOCK (gtk_sink);
gtk_sink->window = NULL; gtk_sink->window = NULL;
else
g_assert_not_reached ();
GST_OBJECT_UNLOCK (gtk_sink); GST_OBJECT_UNLOCK (gtk_sink);
} }
@ -314,7 +317,7 @@ gst_gtk_base_sink_start_on_main (GstBaseSink * bsink)
gtk_window_set_title (GTK_WINDOW (gst_sink->window), klass->window_title); gtk_window_set_title (GTK_WINDOW (gst_sink->window), klass->window_title);
gtk_container_add (GTK_CONTAINER (gst_sink->window), toplevel); gtk_container_add (GTK_CONTAINER (gst_sink->window), toplevel);
g_signal_connect (gst_sink->window, "destroy", g_signal_connect (gst_sink->window, "destroy",
G_CALLBACK (widget_destroy_cb), gst_sink); G_CALLBACK (window_destroy_cb), gst_sink);
} }
return TRUE; return TRUE;